1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
|
diff -ur mercury-extras-10.04.2.orig/cgi/Mmakefile mercury-extras-10.04.2/cgi/Mmakefile
--- mercury-extras-10.04.2.orig/cgi/Mmakefile 2004-07-30 19:01:07.000000000 +1200
+++ mercury-extras-10.04.2/cgi/Mmakefile 2010-10-23 15:38:16.000000000 +1300
@@ -12,6 +12,9 @@
MAIN_TARGET = $(LIBRARY)
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+LIBGRADES := $(filter-out erlang,$(LIBGRADES))
+
MCFLAGS-mercury_www = --no-warn-nothing-exported
depend: mercury_www.depend
diff -ur mercury-extras-10.04.2.orig/complex_numbers/Mmakefile mercury-extras-10.04.2/complex_numbers/Mmakefile
--- mercury-extras-10.04.2.orig/complex_numbers/Mmakefile 2003-01-16 23:44:11.000000000 +1300
+++ mercury-extras-10.04.2/complex_numbers/Mmakefile 2010-10-23 15:38:16.000000000 +1300
@@ -10,6 +10,9 @@
MAIN_TARGET = all
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+LIBGRADES := $(filter-out erlang,$(LIBGRADES))
+
all: libcomplex_numbers
depend: complex_numbers.depend
diff -ur mercury-extras-10.04.2.orig/curs/Mmakefile mercury-extras-10.04.2/curs/Mmakefile
--- mercury-extras-10.04.2.orig/curs/Mmakefile 2003-01-16 23:44:14.000000000 +1300
+++ mercury-extras-10.04.2/curs/Mmakefile 2010-10-23 15:38:16.000000000 +1300
@@ -26,7 +26,8 @@
# Omit this line if you want to install the default grades.
# Edit this line if you want to install with different grades.
#
-#LIBGRADES = asm_fast.gc hlc.gc
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+LIBGRADES := $(filter-out erlang,$(LIBGRADES))
# The following standard libraries must be linked against in any
# application using the curs library (i.e. MLLIBS must include
diff -ur mercury-extras-10.04.2.orig/curses/Mmakefile mercury-extras-10.04.2/curses/Mmakefile
--- mercury-extras-10.04.2.orig/curses/Mmakefile 2003-01-16 23:44:15.000000000 +1300
+++ mercury-extras-10.04.2/curses/Mmakefile 2010-10-23 15:38:16.000000000 +1300
@@ -13,6 +13,9 @@
# this line to include the appropriate curses library for your OS.
MLLIBS = -lncurses
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+LIBGRADES := $(filter-out erlang,$(LIBGRADES))
+
-include ../Mmake.params
default_target: libmcurses
diff -ur mercury-extras-10.04.2.orig/dynamic_linking/Mmakefile mercury-extras-10.04.2/dynamic_linking/Mmakefile
--- mercury-extras-10.04.2.orig/dynamic_linking/Mmakefile 2005-01-25 20:49:05.000000000 +1300
+++ mercury-extras-10.04.2/dynamic_linking/Mmakefile 2010-10-23 15:38:16.000000000 +1300
@@ -17,6 +17,9 @@
CFLAGS = -g
MLFLAGS += --no-strip
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+LIBGRADES := $(filter-out erlang,$(LIBGRADES))
+
-include ../Mmake.params
main_target: libdl
diff -ur mercury-extras-10.04.2.orig/graphics/mercury_glut/Mmakefile mercury-extras-10.04.2/graphics/mercury_glut/Mmakefile
--- mercury-extras-10.04.2.orig/graphics/mercury_glut/Mmakefile 2006-03-30 14:52:44.000000000 +1200
+++ mercury-extras-10.04.2/graphics/mercury_glut/Mmakefile 2010-10-23 15:38:16.000000000 +1300
@@ -10,6 +10,9 @@
MAIN_TARGET = libmercury_glut
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+LIBGRADES := $(filter-out erlang,$(LIBGRADES))
+
# The following libraries are for X on Linux (Debian) using Mesa.
# Libaries required by X windows.
diff -ur mercury-extras-10.04.2.orig/graphics/mercury_opengl/Mmakefile mercury-extras-10.04.2/graphics/mercury_opengl/Mmakefile
--- mercury-extras-10.04.2.orig/graphics/mercury_opengl/Mmakefile 2007-10-11 19:21:31.000000000 +1300
+++ mercury-extras-10.04.2/graphics/mercury_opengl/Mmakefile 2010-10-23 15:38:16.000000000 +1300
@@ -15,6 +15,9 @@
MAIN_TARGET = libmercury_opengl
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+LIBGRADES := $(filter-out erlang,$(LIBGRADES))
+
# Specify what libraries we need to link against for OpenGL on this system.
# (The following works on Debian with mesa as the OpenGL implementation).
GL_LIBS = -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXt -lICE -lXext -lSM
diff -ur mercury-extras-10.04.2.orig/graphics/mercury_tcltk/Mmakefile mercury-extras-10.04.2/graphics/mercury_tcltk/Mmakefile
--- mercury-extras-10.04.2.orig/graphics/mercury_tcltk/Mmakefile 2005-08-15 16:11:42.000000000 +1200
+++ mercury-extras-10.04.2/graphics/mercury_tcltk/Mmakefile 2010-10-23 15:38:16.000000000 +1300
@@ -21,6 +21,9 @@
MAIN_TARGET = $(LIBRARY)
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+LIBGRADES := $(filter-out erlang,$(LIBGRADES))
+
depend: mercury_tcltk.depend
install: libmercury_tcltk.install
diff -ur mercury-extras-10.04.2.orig/lazy_evaluation/Mmakefile mercury-extras-10.04.2/lazy_evaluation/Mmakefile
--- mercury-extras-10.04.2.orig/lazy_evaluation/Mmakefile 2003-01-16 23:44:17.000000000 +1300
+++ mercury-extras-10.04.2/lazy_evaluation/Mmakefile 2010-10-23 15:38:16.000000000 +1300
@@ -4,6 +4,9 @@
# Public License - see the file COPYING.LIB in the Mercury distribution.
#-----------------------------------------------------------------------------#
INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+LIBGRADES := $(filter-out erlang,$(LIBGRADES))
+
-include ../Mmake.params
default_target: all
depend: lazy_list.depend lazy_list_test.depend
diff -ur mercury-extras-10.04.2.orig/moose/Mmakefile mercury-extras-10.04.2/moose/Mmakefile
--- mercury-extras-10.04.2.orig/moose/Mmakefile 2003-01-16 23:44:20.000000000 +1300
+++ mercury-extras-10.04.2/moose/Mmakefile 2010-10-23 15:38:16.000000000 +1300
@@ -6,6 +6,8 @@
# GRADE = asm_fast.gc.debug
# GRADE = asm_fast.gc.prof
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+LIBGRADES := $(filter-out erlang,$(LIBGRADES))
# MCFLAGS = -O6
# MCFLAGS = --intermodule-optimization -O6
diff -ur mercury-extras-10.04.2.orig/odbc/Mmakefile mercury-extras-10.04.2/odbc/Mmakefile
--- mercury-extras-10.04.2.orig/odbc/Mmakefile 2006-04-03 18:19:54.000000000 +1200
+++ mercury-extras-10.04.2/odbc/Mmakefile 2010-10-23 15:38:16.000000000 +1300
@@ -8,6 +8,8 @@
#-----------------------------------------------------------------------------#
# Configuration
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+LIBGRADES := $(filter-out erlang,$(LIBGRADES))
# The driver manager.
# Legal values for MODBC_DRIVER are MODBC_IODBC, MODBC_UNIX, and MODBC_MS.
diff -ur mercury-extras-10.04.2.orig/posix/Mmakefile mercury-extras-10.04.2/posix/Mmakefile
--- mercury-extras-10.04.2.orig/posix/Mmakefile 2008-09-02 21:45:54.000000000 +1200
+++ mercury-extras-10.04.2/posix/Mmakefile 2010-10-23 15:38:16.000000000 +1300
@@ -8,6 +8,9 @@
-include ../Mmake.params
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+LIBGRADES := $(filter-out erlang,$(LIBGRADES))
+
# The following is needed (on some systems) to enable declarations of
# Posix functions in standard C header files.
MGNUCFLAGS = --no-ansi
diff -ur mercury-extras-10.04.2.orig/quickcheck/Mmakefile mercury-extras-10.04.2/quickcheck/Mmakefile
--- mercury-extras-10.04.2.orig/quickcheck/Mmakefile 2003-01-16 23:44:24.000000000 +1300
+++ mercury-extras-10.04.2/quickcheck/Mmakefile 2010-10-23 15:38:16.000000000 +1300
@@ -10,6 +10,9 @@
MAIN_TARGET = all
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+LIBGRADES := $(filter-out erlang,$(LIBGRADES))
+
.PHONY: depend
depend: qcheck.depend test_qcheck.depend
diff -ur mercury-extras-10.04.2.orig/solver_types/library/Mmakefile mercury-extras-10.04.2/solver_types/library/Mmakefile
--- mercury-extras-10.04.2.orig/solver_types/library/Mmakefile 2006-09-18 13:36:36.000000000 +1200
+++ mercury-extras-10.04.2/solver_types/library/Mmakefile 2010-10-23 15:39:10.000000000 +1300
@@ -16,6 +16,9 @@
install: libany.install
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+LIBGRADES := $(filter-out erlang,$(LIBGRADES))
+
MCFLAGS-any= --no-warn-nothing-exported --no-warn-interface-imports
.PHONY: check
diff -ur mercury-extras-10.04.2.orig/xml/Mmakefile mercury-extras-10.04.2/xml/Mmakefile
--- mercury-extras-10.04.2.orig/xml/Mmakefile 2002-03-06 23:10:31.000000000 +1300
+++ mercury-extras-10.04.2/xml/Mmakefile 2010-10-23 15:38:16.000000000 +1300
@@ -8,6 +8,9 @@
INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
+LIBGRADES := $(filter-out java,$(LIBGRADES))
+LIBGRADES := $(filter-out erlang,$(LIBGRADES))
+
.PHONY: default_target
default_target: tryit libxml
|
GitWeb