summaryrefslogtreecommitdiffstats
path: root/math/ump/files/patch-Makefile
blob: 7bda4aeff1fd31dd85d4acb1fe18843c16ec9b0a (plain)
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
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
--- Makefile	Sat Oct  7 20:17:18 2006
+++ Makefile.port	Tue Nov  7 22:14:53 2006
@@ -2,19 +2,19 @@
 APP_NAME = ump
 
 ## Change this directory name as you like, it's the installation directory
-BIN_DIR = /usr/bin
-DATA_DIR = /usr/share/$(APP_NAME)
+BIN_DIR = $(PREFIX)/bin
+DATA_DIR = $(DATADIR)
 
 
 ## One of these three flags must be uncommented
 ##FLAGS = -DUSE_FLOAT
-FLAGS = -DUSE_DOUBLE
+FLAGS = -DUSE_DOUBLE $(CXXFLAGS)
 ##FLAGS = -DUSE_LONG_DOUBLE
 
 ## If you don't have OpenGL, comment these lines (the 3D plot support will be disabled)
 FLAGS += -DPLOT_3D
 ## You might have to change this path
-GL_LIB = -lGL -lGLU -L/usr/X11/lib
+GL_LIB = -lGL -lGLU -L$(X11BASE)/lib
 ## The next path will be required on some Mac-systems to compile
 ##FLAGS += -I/usr/X11/include/GL
 
@@ -27,7 +27,7 @@
 
 ## Choose your optimization level
 ##FLAGS += -O1
-FLAGS += -O2
+##FLAGS += -O2
 ##FLAGS += -O3
 ##FLAGS += -Os
 
@@ -44,9 +44,10 @@
 ## Uncomment one or both of these if the compilation failes
 ## due to trunc undefined or log2 undefined
 ##FLAGS += -DDONT_HAVE_TRUNC
-##FLAGS += -DDONT_HAVE_LOG2
-
+FLAGS += -DDONT_HAVE_LOG2
 
+## X11 includes
+FLAGS += -I$(X11BASE)/include
 
 ## If you'd like to compile with debuging info avaliable
 ##FLAGS += -ggdb
@@ -90,7 +91,7 @@
 # $< means the name of the first prerequisite
 
 $(APP_NAME): Makefile $(OBJ_FILES) main.o $(GUI_OBJ) addon_functions.o $(ASM_FILES)
-	g++ $(FLAGS) $(GTK_LIB) $(OBJ_FILES) main.o $(GUI_OBJ) addon_functions.o $(ASM_FILES) -o $@ $(GL_LIB)
+	$(CXX) $(FLAGS) $(GTK_LIB) $(OBJ_FILES) main.o $(GUI_OBJ) addon_functions.o $(ASM_FILES) -o $@ $(GL_LIB)
 
 clean:
 	-rm -f $(OBJ_FILES)
@@ -102,18 +103,16 @@
 	-rm -f inliner
 
 text: Makefile $(OBJ_FILES) addon_functions.text.o $(ASM_FILES)
-	g++ $(FLAGS) $(FILES) $(OBJ_FILES) addon_functions.text.o $(ASM_FILES) -DNO_GTK -o $(APP_NAME) -DDATA_DIR=\"$(DATA_DIR)\" -DFLAGS="\"$(FLAGS)\"" $(GL_LIB)
+	$(CXX) $(FLAGS) $(FILES) $(OBJ_FILES) addon_functions.text.o $(ASM_FILES) -DNO_GTK -o $(APP_NAME) -DDATA_DIR=\"$(DATA_DIR)\" -DFLAGS="\"$(FLAGS)\"" $(GL_LIB)
 
 
 install:
 	install -s $(APP_NAME) $(BIN_DIR)/$(APP_NAME)
-	chmod -c 755 $(BIN_DIR)/$(APP_NAME)
+	chmod 755 $(BIN_DIR)/$(APP_NAME)
 	install -d $(DATA_DIR)
-	install ump.conf $(DATA_DIR)
-	chmod -c 644 $(DATA_DIR)/ump.conf
 	install -d $(DATA_DIR)/ump-files
 	install ump-files/* $(DATA_DIR)/ump-files
-	chmod -c 644 $(DATA_DIR)/ump-files/*
+	chmod 644 $(DATA_DIR)/ump-files/*
 
 uninstall:
 	rm -f $(BIN_DIR)/$(APP_NAME)
@@ -123,108 +122,108 @@
 
 
 main.o: $(FILES) Makefile $(GUI_HEADER) $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h $(SRC)/addon_functions.h $(SRC)/ump_3d_viewer.h
-	g++ $(FLAGS) -c $(GTK_CFLAGS) $(FILES) -o $@ -DDATA_DIR=\"$(DATA_DIR)\" -DFLAGS="\"$(FLAGS)\""
+	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $(FILES) -o $@ -DDATA_DIR=\"$(DATA_DIR)\" -DFLAGS="\"$(FLAGS)\""
 
 picture2gtk.o: $(SRC)/picture2gtk.cpp Makefile $(SRC)/picture2gtk.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
-	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
+	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 
 ump_advancedwin.o: $(SRC)/ump_advancedwin.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/picture.h $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
-	g++ $(FLAGS) $(AUTO_COMPLETION) -c $(GTK_CFLAGS) $< -o $@
+	$(CXX) $(FLAGS) $(AUTO_COMPLETION) -c $(GTK_CFLAGS) $< -o $@
 
 ump_3d_viewer.o: $(SRC)/ump_3d_viewer.cpp Makefile $(SRC)/ump_3d_viewer.h $(SRC)/main.h $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/picture.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 ump_editor.o: $(SRC)/ump_editor.cpp Makefile $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
-	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
+	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 
 ump_graphwin.o: $(SRC)/ump_graphwin.cpp Makefile $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vector.h $(SRC)/gradient_editor.h
-	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
+	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 
 ump_prefwin.o: $(SRC)/ump_prefwin.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/picture.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/ump_picturewin.h
-	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
+	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 
 ump_aboutwin.o: $(SRC)/ump_aboutwin.cpp Makefile $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
-	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
+	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 
 ump_simplewin.o: $(SRC)/ump_simplewin.cpp Makefile $(SRC)/image_sqrt.c $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/picture.h
-	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
+	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 
 matrix_editor.o: $(SRC)/matrix_editor.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
-	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
+	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 
 ump_picturewin.o: $(SRC)/ump_picturewin.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
-	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
+	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 
 addon_functions.o: $(SRC)/addon_functions.cpp Makefile $(SRC)/addon_functions.h $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h $(SRC)/main.h $(SRC)/ump_picturewin.h
-	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
+	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 
 addon_functions.text.o: $(SRC)/addon_functions.cpp Makefile $(SRC)/addon_functions.h $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h $(SRC)/main.h
-	g++ $(FLAGS) -c -DNO_GTK $(SRC)/addon_functions.cpp -o $@
+	$(CXX) $(FLAGS) -c -DNO_GTK $(SRC)/addon_functions.cpp -o $@
 
 gradient_editor.o: $(SRC)/gradient_editor.cpp $(SRC)/gradient_editor.h $(SRC)/vector.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
-	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
+	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 
 vartypes.o: $(SRC)/vartypes.cpp Makefile $(SRC)/vartypes.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 keyfile.o: $(SRC)/keyfile.cpp Makefile $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 utf8_string.o: $(SRC)/utf8_string.cpp Makefile $(SRC)/utf8_string.h $(SRC)/vartypes.h $(SRC)/keyfile.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 picture.o: $(SRC)/picture.cpp Makefile $(SRC)/picture.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 integer.o: $(SRC)/integer.cpp Makefile $(SRC)/integer.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 real.o: $(SRC)/real.cpp Makefile $(SRC)/integer.h $(SRC)/real.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 complex.o: $(SRC)/complex.cpp Makefile $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/complex.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 matrix.o: $(SRC)/matrix.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 
 
 math2.o: $(SRC)/math2.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/math2.intern.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 math2.picture.o: $(SRC)/math2.picture.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 math2.variable.o: $(SRC)/math2.variable.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 math2.variablelist.o: $(SRC)/math2.variablelist.cpp Makefile $(SRC)/vector.h $(SRC)/math2.intern.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 math2.functionlist.o: $(SRC)/math2.functionlist.cpp Makefile $(SRC)/vector.h $(SRC)/math2.intern.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 math2.builtin.o: $(SRC)/math2.builtin.cpp Makefile $(SRC)/vector.h $(SRC)/math2.intern.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 math2.codeline.o: $(SRC)/math2.codeline.cpp Makefile $(SRC)/vector.h $(SRC)/math2.intern.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 math2.codeblock.o: $(SRC)/math2.codeblock.cpp Makefile $(SRC)/vector.h $(SRC)/math2.intern.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 math2.array.o: $(SRC)/math2.array.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
-	g++ $(FLAGS) -c $< -o $@
+	$(CXX) $(FLAGS) -c $< -o $@
 
 
 
 ## Here we create the converter and convert the Swedish translation file into an inline-file
 inliner: $(SRC)/inliner.c Makefile
-	gcc $< -o $@
+	$(CC) $< -o $@
 
 translation_svenska.c: translations/Svenska inliner
 	./inliner $< translation_svenska $@
 
 translation_svenska.o: translation_svenska.c
-	gcc $< -c -o $@
+	$(CC) $< -c -o $@
OpenPOWER on IntegriCloud