1 --- Makefile.inc~ 2005-01-01 21:43:08.234824232 +0100
2 +++ Makefile.inc 2005-01-01 21:43:10.446488008 +0100
5 # === compiler options ===
6 COPTS = -D$(ARCH) -funsigned-char $(XMLCFLAGS) -I $(INCDIR) $(DEBUGINFO) -Wall
7 -OPTS = -ftemplate-depth-40 $(COPTS)
8 +OPTS = -ftemplate-depth-40 $(COPTS) $(CFLAGS) $(CXXFLAGS)
9 CLNT_LDFLAGS = $(LDFLAGS)
10 SRV_LDFLAGS = $(LDFLAGS)
12 --- Makefile~ 2005-01-01 23:15:21.344663680 +0100
13 +++ Makefile 2005-01-01 23:15:37.120265424 +0100
16 export TOPDIR=$(CURDIR)
18 -all: includes bison libs server client tags
19 +all: includes bison/bison++ libs server client tags
22 cd $(INCDIR); $(MAKE) links
26 @echo "[CONFIG ] /bison++/"
27 - cd $(PREFIX)/bison++; ./configure &>configure.log
28 + cd $(PREFIX)/bison++; ./configure >configure.log
29 @echo "[MAKE ] /bison++/bison++"
30 - cd $(PREFIX)/bison++; $(MAKE)
31 + $(MAKE) -C $(PREFIX)/bison++
36 @echo "[RM ] dibbler-$(VERSION)-src.tar.gz"
37 rm -f dibbler-$(VERSION)-src.tar.gz
39 - if [ -e bison++/Makefile ]; then echo "[CLEAN ] /bison++"; cd bison++; $(MAKE) clean; fi
40 + if [ -e bison++/Makefile ]; then echo "[CLEAN ] /bison++"; $(MAKE) -C bison++ clean; fi
41 @echo "[TAR/GZ ] ../dibbler-tmp.tar.gz"
42 cd ..; tar czvf dibbler-tmp.tar.gz --exclude CVS --exclude '*.exe' --exclude '*.o' \
43 --exclude '*.a' --exclude '*.deb' --exclude '*.tar.gz' dibbler > filelist-src
45 $(CP) $$file ../../../.. ; \
48 -install: server client doc
49 +install: server client
50 $(MKDIR) $(INST_WORKDIR)
51 @echo "[INSTALL] $(SERVERBIN)"
52 $(INSTALL) -m 755 $(SERVERBIN) $(INST_WORKDIR)/
53 --- Makefile.inc.bak 2005-01-01 23:16:46.939651264 +0100
54 +++ Makefile.inc 2005-01-01 23:44:20.321299048 +0100
61 BISONPP = $(PREFIX)/bison++/bison++ -S $(PREFIX)/bison++/bison.cc -H $(PREFIX)/bison++/bison.h
63 # === UNIVERSAL TARGETS ===
66 - @echo "[CPP ] $(SUBDIR)/$@"
67 - $(CPP) $(OPTS) -c -o $@ $<
68 + @echo "[CXX ] $(SUBDIR)/$@"
69 + $(CXX) $(OPTS) -c -o $@ $<
72 @echo "[LIB ] $(SUBDIR)/$@"
73 --- Makefile.bak 2005-01-01 23:16:46.939651264 +0100
74 +++ Makefile 2005-01-01 23:44:20.318299504 +0100
77 $(CLIENTBIN): includes commonlibs clntlibs DHCPClient.o $(CLIENT)
78 @echo "[LINK ] $(SUBDIR)/$@"
79 - $(CPP) $(OPTS) $(CLNTLINKOPTS) -o $@ DHCPClient.o $(CLIENT) \
80 + $(CXX) $(OPTS) $(CLNTLINKOPTS) -o $@ DHCPClient.o $(CLIENT) \
82 -L$(ADDRMGR) -lAddrMgr \
83 -L$(CLNTADDRMGR) -lClntAddrMgr \
86 $(SERVERBIN): includes commonlibs srvlibs DHCPServer.o $(SERVER)
87 @echo "[LINK ] $(SUBDIR)/$@"
88 - $(CPP) $(OPTS) -I $(INCDIR) $(SRVLINKOPTS) -o $@ DHCPServer.o $(SERVER) \
89 + $(CXX) $(OPTS) -I $(INCDIR) $(SRVLINKOPTS) -o $@ DHCPServer.o $(SERVER) \
90 -L$(SRVADDRMGR) -lSrvAddrMgr \
91 -L$(ADDRMGR) -lAddrMgr \
95 echo " C++ compiler used " >> VERSION
96 echo "-------------------" >> VERSION
97 - $(CPP) --version >> VERSION
98 + $(CXX) --version >> VERSION
101 echo " C compiler used " >> VERSION
102 --- ./ClntAddrMgr/Makefile.bak 2004-06-04 15:10:07.000000000 +0200
103 +++ ./ClntAddrMgr/Makefile 2005-01-02 00:20:13.366986352 +0100
107 test1: test1.cpp libs
108 - $(CPP) $(OPTS) -I $(INCDIR) -o $@ test1.cpp \
109 + $(CXX) $(OPTS) -I $(INCDIR) -o $@ test1.cpp \
111 --- ./ClntCfgMgr/Makefile.bak 2004-11-29 22:21:56.000000000 +0100
112 +++ ./ClntCfgMgr/Makefile 2005-01-02 00:20:13.391982552 +0100
114 libs: libClntCfgMgr.a
116 ClntLexer.o: ClntLexer.cpp
117 - @echo "[CPP ] $(SUBDIR)/$@"
118 - $(CPP) $(OPTS) -c -ftemplate-depth-30 ClntLexer.cpp
119 + @echo "[CXX ] $(SUBDIR)/$@"
120 + $(CXX) $(OPTS) -c -ftemplate-depth-30 ClntLexer.cpp
122 parser: ClntParser.y ClntLexer.l
123 echo "[BISON++] ClntParser.y"
125 echo "[FLEX ] ClntLexer.l"
126 $(FLEX) -+ -i -L -oClntLexer.cpp ClntLexer.l
127 $(FLEX) -+ -i -oClntLexer.cpp ClntLexer.l
128 -# echo "[CPP ] $(SUBDIR)/ClntParser.cpp"
129 -# $(CPP) $(OPTS) -c -ftemplate-depth-30 ClntParser.cpp
130 +# echo "[CXX ] $(SUBDIR)/ClntParser.cpp"
131 +# $(CXX) $(OPTS) -c -ftemplate-depth-30 ClntParser.cpp
133 --- ./SrvCfgMgr/Makefile.bak 2004-10-25 22:45:53.000000000 +0200
134 +++ ./SrvCfgMgr/Makefile 2005-01-02 00:20:13.402980880 +0100
138 SrvLexer.o: SrvLexer.cpp
139 - @echo "[CPP ] $(SUBDIR)/$@"
140 - $(CPP) -c $(OPTS) -ftemplate-depth-30 SrvLexer.cpp
141 + @echo "[CXX ] $(SUBDIR)/$@"
142 + $(CXX) -c $(OPTS) -ftemplate-depth-30 SrvLexer.cpp
144 parser: SrvParser.y SrvLexer.l
145 echo "[BISON++] SrvParser.y"
146 --- ./port-linux/Makefile.bak 2004-11-02 00:31:25.000000000 +0100
147 +++ ./port-linux/Makefile 2005-01-02 00:20:13.413979208 +0100
151 test1: test1.cpp dns.c
152 - $(CPP) $(OPTS) test1.cpp dns.c -o test1
153 + $(CXX) $(OPTS) test1.cpp dns.c -o test1
155 test2: test2.cpp libLowLevel.a
156 cd $(SRVCFGMGR); $(MAKE) libs
157 - $(CPP) $(OPTS) test2.cpp -L. -lLowLevel -o test2
158 + $(CXX) $(OPTS) test2.cpp -L. -lLowLevel -o test2
160 test3: test1.cpp SrvParser.cpp SrvLexer.o
161 cd $(SRVCFGMGR); $(MAKE) libs
162 - $(CPP) $(OPTS) -I $(INCDIR) -o $@ test3.cpp SrvParser.cpp SrvLexer.o \
163 + $(CXX) $(OPTS) -I $(INCDIR) -o $@ test3.cpp SrvParser.cpp SrvLexer.o \
164 -L. -lSrvParser -L$(SRVCFGMGR) -lSrvCfgMgr ../IPv6Addr.cpp ../DUID.cpp \
165 $(LOWLEVEL)/addrpack.o ../Logger.o
166 --- ./test/Makefile.bak 2004-12-02 01:51:30.000000000 +0100
167 +++ ./test/Makefile 2005-01-02 00:20:13.424977536 +0100
170 test14: test14.cpp ../misc/Logger.cpp
171 cd ../misc; $(MAKE) Logger.o
172 - $(CPP) $(OPTS) -o $@ $< ../misc/Logger.o
173 + $(CXX) $(OPTS) -o $@ $< ../misc/Logger.o