1 diff -Nur cluster-1.02.00.orig/ccs/ccs_test/Makefile cluster-1.02.00.optflags/ccs/ccs_test/Makefile
2 --- cluster-1.02.00.orig/ccs/ccs_test/Makefile 2005-02-11 18:30:44.000000000 +0100
3 +++ cluster-1.02.00.optflags/ccs/ccs_test/Makefile 2006-08-04 02:47:34.000000000 +0200
5 INCLUDE+= -I. -I${top_srcdir}/include -I${ccs_libdir} -I${top_srcdir}/config
8 -CFLAGS+= -O2 -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DDEBUG -g \
9 +CFLAGS+= $(OPTCFLAGS) -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DDEBUG -g \
10 -DCCS_RELEASE_NAME=\"${RELEASE}\"
12 -CFLAGS+= -O2 -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DCCS_RELEASE_NAME=\"${RELEASE}\"
13 +CFLAGS+= $(OPTCFLAGS) -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DCCS_RELEASE_NAME=\"${RELEASE}\"
16 -LDFLAGS+= -L${ccs_libdir}
18 +LOADLIBES+= -L${ccs_libdir} -lccs
23 cp ccs_test ${top_srcdir}/bin
25 ccs_test: ccs_test.c ${ccs_libdir}/libccs.a
26 - ${CC} ${CFLAGS} ${INCLUDE} ccs_test.c ${LDFLAGS} ${LOADLIBES} ${LDLIBS}-o $@
27 + ${CC} ${CFLAGS} ${INCLUDE} ${LDFLAGS} ccs_test.c ${LOADLIBES} ${LDLIBS} -o $@
29 ${ccs_libdir}/libccs.a:
30 cd ${ccs_libdir} && ${MAKE} libccs.a
31 diff -Nur cluster-1.02.00.orig/ccs/ccs_tool/Makefile cluster-1.02.00.optflags/ccs/ccs_tool/Makefile
32 --- cluster-1.02.00.orig/ccs/ccs_tool/Makefile 2005-05-12 17:17:39.000000000 +0200
33 +++ cluster-1.02.00.optflags/ccs/ccs_tool/Makefile 2006-08-04 02:48:38.000000000 +0200
38 -CFLAGS+= -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DDEBUG -g \
39 +CFLAGS+= -Wall $(OPTCFLAGS) -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DDEBUG -g \
40 `xml2-config --cflags` -DCCS_RELEASE_NAME=\"${RELEASE}\"
42 -CFLAGS+= -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE \
43 +CFLAGS+= -Wall $(OPTCFLAGS) -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE \
44 `xml2-config --cflags` -DCCS_RELEASE_NAME=\"${RELEASE}\"
47 -LDFLAGS+= -L${ccs_libdir} `xml2-config --libs` -L${libdir}
48 +LOADLIBES+= -L${ccs_libdir} `xml2-config --libs` -L${libdir}
49 LOADLIBES+= -lccs -ldl
53 ccs_tool: ccs_tool.c update.c upgrade.c old_parser.c editconf.c
54 - ${CC} ${CFLAGS} ${INCLUDE} -o $@ $^ ${LDFLAGS} ${LOADLIBES} \
55 - ../../cman/lib/libcman.a
56 + ${CC} ${CFLAGS} ${LDFLAGS} ${INCLUDE} -o $@ $^ ${LOADLIBES} \
61 diff -Nur cluster-1.02.00.orig/ccs/daemon/Makefile cluster-1.02.00.optflags/ccs/daemon/Makefile
62 --- cluster-1.02.00.orig/ccs/daemon/Makefile 2004-10-19 01:00:39.000000000 +0200
63 +++ cluster-1.02.00.optflags/ccs/daemon/Makefile 2006-08-04 02:43:07.000000000 +0200
65 INCLUDE= -I. -I../include -I../common -I${top_srcdir}/config -I../../cman/lib
68 -CFLAGS+= -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DDEBUG -g \
69 +CFLAGS+= -Wall $(OPTCFLAGS) -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DDEBUG -g \
70 `xml2-config --cflags` -DCCS_RELEASE_NAME=\"${RELEASE}\"
72 -CFLAGS+= -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE \
73 +CFLAGS+= -Wall $(OPTCFLAGS) -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE \
74 `xml2-config --cflags` -DCCS_RELEASE_NAME=\"${RELEASE}\"
77 -LDFLAGS+= -L${libdir} `xml2-config --libs` -lpthread -ldl
78 +LIBS += -L${libdir} `xml2-config --libs` -lpthread -ldl
82 ccsd: ccsd.c cnx_mgr.c cluster_mgr.c misc.c ../common/log.c globals.c
83 - ${CC} ${CFLAGS} ${INCLUDE} -o $@ $^ ${LDFLAGS} \
84 - ../../cman/lib/libcman.a
85 + ${CC} ${CFLAGS} ${LDFLAGS} ${INCLUDE} -o $@ $^ ${LIBS} \
90 diff -Nur cluster-1.02.00.orig/ccs/lib/Makefile cluster-1.02.00.optflags/ccs/lib/Makefile
91 --- cluster-1.02.00.orig/ccs/lib/Makefile 2004-08-03 18:39:14.000000000 +0200
92 +++ cluster-1.02.00.optflags/ccs/lib/Makefile 2006-08-04 02:44:51.000000000 +0200
94 INCLUDE = -I../include -I../common
97 -CFLAGS+= -O2 -fPIC -D_FILE_OFFSET_BITS=64 -DDEBUG -g
98 +CFLAGS+= $(OPTCFLAGS) -fPIC -D_FILE_OFFSET_BITS=64 -DDEBUG -g
100 -CFLAGS+= -O2 -fPIC -D_FILE_OFFSET_BITS=64
101 +CFLAGS+= $(OPTCFLAGS) -fPIC -D_FILE_OFFSET_BITS=64