|
Lines 12-25
Link Here
|
| 12 |
-CFLAGSad = -DASTYLE_LIB -g $(CBASEFLAGS) |
12 |
-CFLAGSad = -DASTYLE_LIB -g $(CBASEFLAGS) |
| 13 |
-CFLAGSsj = -DNDEBUG -DASTYLE_JNI -O3 -fpic $(CBASEFLAGS) $(JAVAINCS) |
13 |
-CFLAGSsj = -DNDEBUG -DASTYLE_JNI -O3 -fpic $(CBASEFLAGS) $(JAVAINCS) |
| 14 |
-CFLAGSsjd = -DASTYLE_JNI -g -fpic $(CBASEFLAGS) $(JAVAINCS) |
14 |
-CFLAGSsjd = -DASTYLE_JNI -g -fpic $(CBASEFLAGS) $(JAVAINCS) |
| 15 |
+CFLAGSb = -DNDEBUG $(CFLAGS) |
15 |
+CFLAGSb = -DNDEBUG $(CXXFLAGS) |
| 16 |
+CFLAGSd = -g $(CFLAGS) |
16 |
+CFLAGSd = -g $(CXXFLAGS) |
| 17 |
+CFLAGSs = -DNDEBUG -DASTYLE_LIB -fPIC $(CFLAGS) |
17 |
+CFLAGSs = -DNDEBUG -DASTYLE_LIB -fPIC $(CXXFLAGS) |
| 18 |
+CFLAGSsd = -DASTYLE_LIB -g -fPIC $(CFLAGS) |
18 |
+CFLAGSsd = -DASTYLE_LIB -g -fPIC $(CXXFLAGS) |
| 19 |
+CFLAGSa = -DNDEBUG -DASTYLE_LIB $(CFLAGS) |
19 |
+CFLAGSa = -DNDEBUG -DASTYLE_LIB $(CXXFLAGS) |
| 20 |
+CFLAGSad = -DASTYLE_LIB -g $(CFLAGS) |
20 |
+CFLAGSad = -DASTYLE_LIB -g $(CXXFLAGS) |
| 21 |
+CFLAGSsj = -DNDEBUG -DASTYLE_JNI -fPIC $(CFLAGS) $(JAVAINCS) |
21 |
+CFLAGSsj = -DNDEBUG -DASTYLE_JNI -fPIC $(CXXFLAGS) $(JAVAINCS) |
| 22 |
+CFLAGSsjd = -DASTYLE_JNI -g -fPIC $(CFLAGS) $(JAVAINCS) |
22 |
+CFLAGSsjd = -DASTYLE_JNI -g -fPIC $(CXXFLAGS) $(JAVAINCS) |
| 23 |
|
23 |
|
| 24 |
# object files are built from the source list $(SRC) |
24 |
# object files are built from the source list $(SRC) |
| 25 |
# a suffix is added for each build |
25 |
# a suffix is added for each build |
|
Lines 37-43
Link Here
|
| 37 |
astyle: $(OBJ) |
37 |
astyle: $(OBJ) |
| 38 |
@ mkdir -p $(bindir) |
38 |
@ mkdir -p $(bindir) |
| 39 |
- $(CXX) -s -o $(bindir)/$@ $^ |
39 |
- $(CXX) -s -o $(bindir)/$@ $^ |
| 40 |
+ $(CXX) -o $(bindir)/$@ $^ |
40 |
+ $(CXX) $(LDFLAGS) -o $(bindir)/$@ $^ |
| 41 |
@ echo |
41 |
@ echo |
| 42 |
|
42 |
|
| 43 |
debug: astyled |
43 |
debug: astyled |
|
Lines 46-52
Link Here
|
| 46 |
libastyle.so: $(OBJs) |
46 |
libastyle.so: $(OBJs) |
| 47 |
@ mkdir -p $(bindir) |
47 |
@ mkdir -p $(bindir) |
| 48 |
- $(CXX) -shared -Wl,-soname,$@ -s -o $(bindir)/$@ $^ |
48 |
- $(CXX) -shared -Wl,-soname,$@ -s -o $(bindir)/$@ $^ |
| 49 |
+ $(CXX) -shared -Wl,-soname,$@ -o $(bindir)/$@ $^ |
49 |
+ $(CXX) $(LDFLAGS) -shared -Wl,-soname,$@ -o $(bindir)/$@ $^ |
| 50 |
@ echo |
50 |
@ echo |
| 51 |
|
51 |
|
| 52 |
shareddebug: libastyled.so |
52 |
shareddebug: libastyled.so |
|
Lines 57-63
Link Here
|
| 57 |
libastylej.so: $(OBJsj) |
57 |
libastylej.so: $(OBJsj) |
| 58 |
@ mkdir -p $(bindir) |
58 |
@ mkdir -p $(bindir) |
| 59 |
- $(CXX) -shared -Wl,-soname,$@ -s -o $(bindir)/$@ $^ |
59 |
- $(CXX) -shared -Wl,-soname,$@ -s -o $(bindir)/$@ $^ |
| 60 |
+ $(CXX) -shared -Wl,-soname,$@ -o $(bindir)/$@ $^ |
60 |
+ $(CXX) $(LDFLAGS) -shared -Wl,-soname,$@ -o $(bindir)/$@ $^ |
| 61 |
@ echo |
61 |
@ echo |
| 62 |
|
62 |
|
| 63 |
javadebug: libastylejd.so |
63 |
javadebug: libastylejd.so |
