summaryrefslogtreecommitdiff
blob: 6dae0a41d41afeab675e3e20b6aa45853136d7d9 (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
--- apachemod/Makefile
+++ apachemod/Makefile
@@ -85,7 +85,7 @@
 	-DUSE_SHMEM \
 	-I../boost_shmem
 
-COMPILE_FLAGS=$(CPP_FLAGS) $(shell $(APR_CONFIG) --cflags) -Wall -O0 -g
+COMPILE_FLAGS=$(CPP_FLAGS) $(shell $(APR_CONFIG) --cflags) -Wall
 
 C_COMPILE_FLAGS=$(COMPILE_FLAGS) -std=gnu99
 
@@ -108,23 +108,23 @@
 OBJS=$(addsuffix .lo,$(basename $(C_SRCS) $(CC_SRCS)))
 
 %.lo: %.cc
-	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CC_COMPILE_FLAGS) -o $@ -c $<
+	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CC_COMPILE_FLAGS) -o $@ -c $<
 
 %.lo: %.c
-	$(LIBTOOL) --mode=compile $(CC) $(C_COMPILE_FLAGS) -o $@ -c $<
+	$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(C_COMPILE_FLAGS) -o $@ -c $<
 
 
 compile: $(OBJS) $(LIBPBE_LIB)
-	$(APXS) -c -o anyterm.la $(OBJS) $(LINK_FLAGS)
+	$(APXS) $(LDFLAGS) -c -o anyterm.la $(OBJS) $(LINK_FLAGS)
 
 install: FORCE
 	$(APXS) -n anyterm -i anyterm.la
 
 %.d: %.cc
-	$(CXX) -MM -MG -MT $@ -MT $(<:%.cc=%.lo) $(CPP_FLAGS) -o $@ $<
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MM -MG -MT $@ -MT $(<:%.cc=%.lo) $(CPP_FLAGS) -o $@ $<
 
 %.d: %.c
-	$(CC) -MM -MG -MT $@ -MT $(<:%.c=%.lo) $(CPP_FLAGS) -o $@ $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -MM -MG -MT $@ -MT $(<:%.c=%.lo) $(CPP_FLAGS) -o $@ $<
 
 DEPENDS=$(addsuffix .d,$(basename $(OBJS)))
 
--- libpbe/build/Makefile
+++ libpbe/build/Makefile
@@ -53,7 +53,7 @@
 
 WARN_FLAGS=-W -Wall
 
-OPTIMISE_FLAGS=-O
+OPTIMISE_FLAGS=
 
 DEBUG_FLAGS=
 
@@ -71,10 +71,10 @@
 	$(AR) ruv $(LIBRARY) $(OBJS)
 
 %.o: %.cc
-	$(CXX) $(COMPILE_FLAGS) -c $<
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(COMPILE_FLAGS) -c $<
 
 %.d: %.cc
-	$(CXX) -pthread -MM -MT $@ -MT $(notdir $(<:%.cc=%.o)) $(INC_FLAGS) -o $@ $<
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -pthread -MM -MT $@ -MT $(notdir $(<:%.cc=%.o)) $(INC_FLAGS) -o $@ $<
 
 all: $(EXECUTABLE)