]>
Commit | Line | Data |
---|---|---|
61331246 | 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 | |
4 | @@ -19,14 +19,13 @@ | |
5 | INCLUDE+= -I. -I${top_srcdir}/include -I${ccs_libdir} -I${top_srcdir}/config | |
6 | ||
7 | ifeq ($(DEBUG),y) | |
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}\" | |
11 | else | |
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}\" | |
14 | endif | |
15 | ||
16 | -LDFLAGS+= -L${ccs_libdir} | |
17 | -LOADLIBES+= -lccs | |
18 | +LOADLIBES+= -L${ccs_libdir} -lccs | |
19 | ||
20 | all: ccs_test | |
21 | ||
22 | @@ -34,7 +33,7 @@ | |
23 | cp ccs_test ${top_srcdir}/bin | |
24 | ||
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 $@ | |
28 | ||
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 | |
a77a0d2f | 34 | @@ -18,21 +18,21 @@ |
35 | -I../../cman/lib | |
61331246 | 36 | |
37 | ifeq ($(DEBUG),y) | |
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}\" | |
41 | else | |
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}\" | |
45 | endif | |
46 | ||
47 | -LDFLAGS+= -L${ccs_libdir} `xml2-config --libs` -L${libdir} | |
48 | +LOADLIBES+= -L${ccs_libdir} `xml2-config --libs` -L${libdir} | |
a77a0d2f | 49 | LOADLIBES+= -lccs -ldl |
61331246 | 50 | |
51 | all: ccs_tool | |
52 | ||
53 | ccs_tool: ccs_tool.c update.c upgrade.c old_parser.c editconf.c | |
a77a0d2f | 54 | - ${CC} ${CFLAGS} ${INCLUDE} -o $@ $^ ${LDFLAGS} ${LOADLIBES} \ |
55 | - ../../cman/lib/libcman.a | |
56 | + ${CC} ${CFLAGS} ${LDFLAGS} ${INCLUDE} -o $@ $^ ${LOADLIBES} \ | |
57 | + -lcman | |
61331246 | 58 | |
59 | clean: | |
60 | rm -f *.o ccs_tool *~ | |
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 | |
a77a0d2f | 64 | @@ -19,20 +19,20 @@ |
65 | INCLUDE= -I. -I../include -I../common -I${top_srcdir}/config -I../../cman/lib | |
61331246 | 66 | |
67 | ifeq ($(DEBUG),y) | |
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}\" | |
71 | else | |
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}\" | |
75 | endif | |
76 | ||
a77a0d2f | 77 | -LDFLAGS+= -L${libdir} `xml2-config --libs` -lpthread -ldl |
78 | +LIBS += -L${libdir} `xml2-config --libs` -lpthread -ldl | |
61331246 | 79 | |
a77a0d2f | 80 | all: ${TARGET} |
61331246 | 81 | |
82 | ccsd: ccsd.c cnx_mgr.c cluster_mgr.c misc.c ../common/log.c globals.c | |
a77a0d2f | 83 | - ${CC} ${CFLAGS} ${INCLUDE} -o $@ $^ ${LDFLAGS} \ |
84 | - ../../cman/lib/libcman.a | |
85 | + ${CC} ${CFLAGS} ${LDFLAGS} ${INCLUDE} -o $@ $^ ${LIBS} \ | |
86 | + -lcman | |
61331246 | 87 | |
a77a0d2f | 88 | install: all |
61331246 | 89 | install -d ${sbindir} |
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 | |
93 | @@ -17,9 +17,9 @@ | |
94 | INCLUDE = -I../include -I../common | |
95 | ||
96 | ifeq ($(DEBUG),y) | |
a77a0d2f | 97 | -CFLAGS+= -O2 -fPIC -D_FILE_OFFSET_BITS=64 -DDEBUG -g |
98 | +CFLAGS+= $(OPTCFLAGS) -fPIC -D_FILE_OFFSET_BITS=64 -DDEBUG -g | |
61331246 | 99 | else |
a77a0d2f | 100 | -CFLAGS+= -O2 -fPIC -D_FILE_OFFSET_BITS=64 |
101 | +CFLAGS+= $(OPTCFLAGS) -fPIC -D_FILE_OFFSET_BITS=64 | |
61331246 | 102 | endif |
103 | ||
104 | all: libccs.a |