* [Cluster-devel] cluster ccs/ccs_tool/Makefile ccs/daemon/Makef ...
@ 2008-02-12 5:45 fabbione
0 siblings, 0 replies; 2+ messages in thread
From: fabbione @ 2008-02-12 5:45 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2008-02-12 05:45:34
Modified files:
ccs/ccs_tool : Makefile
ccs/daemon : Makefile
dlm/lib : Makefile
fence/agents/xvm: Makefile
gnbd/client : Makefile
gnbd/server : Makefile
gnbd/tools/gnbd_export: Makefile
gnbd/tools/gnbd_import: Makefile
rgmanager/src/daemons: Makefile
rgmanager/src/utils: Makefile
Log message:
Stop linking against unrequired libraries.
A lot of small tools were linking against a bunch of libraries for no reasons.
Clean them up as much as possible as static linking is not spotted automatically.
Problem spotted by some Debian automatic test tools and reported by
Frederik Sch??ler <fs@debian.org>
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/Makefile.diff?cvsroot=cluster&r1=1.27&r2=1.28
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/Makefile.diff?cvsroot=cluster&r1=1.31&r2=1.32
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/Makefile.diff?cvsroot=cluster&r1=1.24&r2=1.25
--- cluster/ccs/ccs_tool/Makefile 2007/12/22 13:36:49 1.20
+++ cluster/ccs/ccs_tool/Makefile 2008/02/12 05:45:33 1.21
@@ -34,7 +34,7 @@
CFLAGS += -I${incdir}
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
-LDFLAGS += `xml2-config --libs` -L${libdir} -ldl
+LDFLAGS += `xml2-config --libs` -L${libdir}
${TARGET}: ${OBJS}
--- cluster/ccs/daemon/Makefile 2007/12/22 13:36:49 1.22
+++ cluster/ccs/daemon/Makefile 2008/02/12 05:45:33 1.23
@@ -34,7 +34,7 @@
CFLAGS += -I${incdir}
LDFLAGS += -L${cmanlibdir} -lcman -L${ccslibdir} -lccs
-LDFLAGS += -L${libdir} `xml2-config --libs` -lpthread -ldl
+LDFLAGS += -L${libdir} `xml2-config --libs` -lpthread
${TARGET}: ${OBJS}
--- cluster/dlm/lib/Makefile 2007/12/22 13:36:50 1.27
+++ cluster/dlm/lib/Makefile 2008/02/12 05:45:33 1.28
@@ -45,8 +45,7 @@
CFLAGS += -I${incdir}
CFLAGS += -I$(KERNEL_SRC)/include
-LDFLAGS += -lpthread
-
+PTHREAD_LDFLAGS += -lpthread
$(TARGET).a: $(TARGET).o $(AISTARGET).o
${AR} r $@ $^
@@ -57,7 +56,7 @@
${RANLIB} $@
$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR}: $(TARGET).po $(AISTARGET).po
- $(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname=$(TARGET).so.$(RELEASE_MAJOR) $<
+ $(CC) $(PTHREAD_LDFLAGS) $(LDFLAGS) -shared -o $@ -Wl,-soname=$(TARGET).so.$(RELEASE_MAJOR) $<
ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(TARGET).so
ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(TARGET).so.$(RELEASE_MAJOR)
--- cluster/fence/agents/xvm/Makefile 2007/12/22 13:36:52 1.20
+++ cluster/fence/agents/xvm/Makefile 2008/02/12 05:45:33 1.21
@@ -50,10 +50,10 @@
EXTRA_CFLAGS += -DSTANDALONE
-LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -L${dlmlibdir}
-LDFLAGS += -L${nsslibdir} -L${nsprlibdir} -L${libdir}
-LDFLAGS += -lccs -lcman -ldlm -lnss3 -lnspr4
+LDFLAGS += -L${nsslibdir} -L${libdir}
+LDFLAGS += -lnss3
+EXTRA_LDFLAGS += -L${ccslibdir} -lccs -L${cmanlibdir} -lcman
EXTRA_LDFLAGS += -L${virtlibdir} -lvirt -L${openaislibdir} -lSaCkpt
XML_LDFLAGS += `xml2-config --libs`
--- cluster/gnbd/client/Makefile 2007/12/22 13:52:32 1.21
+++ cluster/gnbd/client/Makefile 2008/02/12 05:45:33 1.22
@@ -37,7 +37,7 @@
CFLAGS += -I$(S)/../include -I$(S)/../server -I$(S)/../utils
CFLAGS += -I${incdir}
-LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
+LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman
${TARGET1}: ${SHAREDOBJS} ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gnbd/server/Makefile 2007/12/22 13:52:32 1.21
+++ cluster/gnbd/server/Makefile 2008/02/12 05:45:33 1.22
@@ -42,7 +42,7 @@
CFLAGS += -I$(S)/../include -I$(S)/../utils
CFLAGS += -I${incdir}
-LDFLAGS+= -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
+LDFLAGS+= -L${libdir} -L${cmanlibdir} -lcman
${TARGET1}: ${SHAREDOBJS} ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gnbd/tools/gnbd_export/Makefile 2007/12/22 13:52:32 1.22
+++ cluster/gnbd/tools/gnbd_export/Makefile 2008/02/12 05:45:33 1.23
@@ -32,7 +32,7 @@
CFLAGS += -I$(S)/../../include -I$(S)/../../server -I$(S)/../../utils
CFLAGS += -I${incdir}
-LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
+LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gnbd/tools/gnbd_import/Makefile 2007/12/22 13:52:32 1.19
+++ cluster/gnbd/tools/gnbd_import/Makefile 2008/02/12 05:45:34 1.20
@@ -33,7 +33,7 @@
CFLAGS += -I$(S)/../../utils -I$(S)/../../client
CFLAGS += -I${incdir}
-LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
+LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/rgmanager/src/daemons/Makefile 2007/12/22 13:36:59 1.31
+++ cluster/rgmanager/src/daemons/Makefile 2008/02/12 05:45:34 1.32
@@ -77,7 +77,7 @@
DLM_LDFLAGS += -L${dlmlibdir} -ldlm
XML2_LDFLAGS += `xml2-config --libs`
SLANG_LDFLAGS += -L${slanglibdir} -lslang
-EXTRA_LDFLAGS += -lpthread -ldl
+EXTRA_LDFLAGS += -lpthread
LOCAL_LDFLAGS += -llalloc
READLINE_LDFLAGS += -L${readlinelibdir} -lreadline
@@ -106,8 +106,7 @@
#
${TARGET3}: ${SHAREDOBJS} ${OBJS3}
$(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
- $(LOCAL_LDFLAGS) $(EXTRA_LDFLAGS) $(XML2_LDFLAGS) \
- $(SLANG_LDFLAGS)
+ $(LOCAL_LDFLAGS) $(EXTRA_LDFLAGS) $(XML2_LDFLAGS)
${TARGET4}: ${SHAREDOBJS} ${OBJS4}
$(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
--- cluster/rgmanager/src/utils/Makefile 2007/12/22 13:36:59 1.24
+++ cluster/rgmanager/src/utils/Makefile 2008/02/12 05:45:34 1.25
@@ -34,10 +34,14 @@
CFLAGS += -I$(S)/../../include
CFLAGS += -I${incdir}
-LDFLAGS += -L${libdir} -L${ccslibdir} -L${cmanlibdir} -L${ncurseslibdir}
-LDFLAGS += -lcman -lpthread -ldl -lncurses -lccs
+LDFLAGS += -L${libdir}
LDFLAGS += -L../clulib -lclulib
+CCS_LDFLAGS += -L${ccslibdir} -lccs
+CMAN_LDFLAGS += -L${cmanlibdir} -lcman
+NCURSES_LDFLAGS += -L${ncurseslibdir} -lncurses
+PTHREAD_LDFLAGS += -lpthread
+
${TARGET1}: ${TARGET1:=.o}
$(CC) -o $@ $^ $(LDFLAGS)
@@ -46,13 +50,14 @@
$(CC) -o $@ $^ $(LDFLAGS)
${TARGET3}: ${TARGET3:=.o}
- $(CC) -o $@ $^ $(LDFLAGS)
+ $(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
+ $(NCURSES_LDFLAGS) $(PTHREAD_LDFLAGS)
${TARGET4}: ${TARGET4:=.o}
- $(CC) -o $@ $^ $(LDFLAGS)
+ $(CC) -o $@ $^ $(LDFLAGS) $(CMAN_LDFLAGS) $(PTHREAD_LDFLAGS)
${TARGET5}: ${TARGET5:=.o}
- $(CC) -o $@ $^ $(LDFLAGS)
+ $(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS)
${TARGET6}:
cp $(S)/${TARGET6}.sh ${TARGET6}
^ permalink raw reply [flat|nested] 2+ messages in thread* [Cluster-devel] cluster ccs/ccs_tool/Makefile ccs/daemon/Makef ...
@ 2007-08-28 4:32 fabbione
0 siblings, 0 replies; 2+ messages in thread
From: fabbione @ 2007-08-28 4:32 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2007-08-28 04:32:48
Modified files:
ccs/ccs_tool : Makefile
ccs/daemon : Makefile
cman/qdisk : Makefile
dlm/tests/usertest: Makefile
fence/agents/xvm: Makefile
gfs/gfs_tool : Makefile
gfs/libgfs : Makefile
gfs2/convert : Makefile
gfs2/fsck : Makefile
gfs2/libgfs2 : Makefile
gfs2/mkfs : Makefile
gfs2/tool : Makefile
Log message:
-Wall is added by default in CFLAGS via configure to make/defines.mk.
Remove all the others redundant definitions.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tests/usertest/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_tool/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/libgfs/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
--- cluster/ccs/ccs_tool/Makefile 2007/08/22 08:58:36 1.13
+++ cluster/ccs/ccs_tool/Makefile 2007/08/28 04:32:47 1.14
@@ -20,7 +20,7 @@
old_parser.o \
editconf.o
-CFLAGS += -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
CFLAGS += -I${ccsincdir} -I${cmanincdir} `xml2-config --cflags`
CFLAGS += -I../include
CFLAGS += -I${incdir}
--- cluster/ccs/daemon/Makefile 2007/08/22 08:58:36 1.15
+++ cluster/ccs/daemon/Makefile 2007/08/28 04:32:47 1.16
@@ -21,7 +21,6 @@
globals.o
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-CFLAGS += -Wall
CFLAGS += -I${cmanincdir} `xml2-config --cflags`
CFLAGS += -I. -I../include -I../common
CFLAGS += -I${incdir}
--- cluster/cman/qdisk/Makefile 2007/06/01 09:45:31 1.11
+++ cluster/cman/qdisk/Makefile 2007/08/28 04:32:47 1.12
@@ -13,7 +13,7 @@
include ../../make/defines.mk
CFLAGS += -D_GNU_SOURCE
-CFLAGS += -Wall -Werror -Wstrict-prototypes -Wshadow -g
+CFLAGS += -Werror -Wstrict-prototypes -Wshadow -g
CFLAGS += -I${ccsincdir} -I${cmanincdir}
CFLAGS += -I.
CFLAGS += -I${incdir}
--- cluster/dlm/tests/usertest/Makefile 2007/08/24 14:10:27 1.11
+++ cluster/dlm/tests/usertest/Makefile 2007/08/28 04:32:47 1.12
@@ -18,7 +18,7 @@
all: depends ${TARGETS}
CFLAGS += -D_REENTRANT
-CFLAGS += -Wall -g
+CFLAGS += -g
CFLAGS += -I${dlmincdir}
LDFLAGS += -L${dlmlibdir} -ldlm -lpthread
--- cluster/fence/agents/xvm/Makefile 2007/08/22 08:58:41 1.13
+++ cluster/fence/agents/xvm/Makefile 2007/08/28 04:32:47 1.14
@@ -34,7 +34,7 @@
debug.o
CFLAGS += -D_GNU_SOURCE
-CFLAGS += -Wall -Werror -Wstrict-prototypes -Wshadow -ggdb
+CFLAGS += -Werror -Wstrict-prototypes -Wshadow -ggdb
CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${openaisincdir}
CFLAGS += -I${virtincdir} -I${nssincdir} -I${nsprincdir}
CFLAGS += `xml2-config --cflags`
--- cluster/gfs/gfs_tool/Makefile 2007/08/22 08:58:44 1.13
+++ cluster/gfs/gfs_tool/Makefile 2007/08/28 04:32:47 1.14
@@ -26,7 +26,7 @@
util.o
CFLAGS += -D_FILE_OFFSET_BITS=64
-CFLAGS += -O2 -Wall
+CFLAGS += -O2
CFLAGS += -I${gfskincdir}
CFLAGS += -I../include
CFLAGS += -I${incdir}
--- cluster/gfs/libgfs/Makefile 2007/08/22 08:58:45 1.8
+++ cluster/gfs/libgfs/Makefile 2007/08/28 04:32:47 1.9
@@ -17,7 +17,7 @@
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
CFLAGS += -D_GNU_SOURCE -DHELPER_PROGRAM
-CFLAGS += -c -Wall -ggdb
+CFLAGS += -c -ggdb
CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
CFLAGS += -I${gfskincdir} -I../include
CFLAGS += -I${incdir}
--- cluster/gfs2/convert/Makefile 2007/08/22 08:58:45 1.10
+++ cluster/gfs2/convert/Makefile 2007/08/28 04:32:47 1.11
@@ -17,7 +17,7 @@
OBJS= gfs2_convert.o
CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM
-CFLAGS += -Wall -g
+CFLAGS += -g
CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
CFLAGS += -I../include -I../libgfs2
CFLAGS += -I${incdir}
--- cluster/gfs2/fsck/Makefile 2007/08/22 08:58:46 1.14
+++ cluster/gfs2/fsck/Makefile 2007/08/28 04:32:48 1.15
@@ -35,7 +35,7 @@
util.o
CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM
-CFLAGS += -MMD -Wall -O2
+CFLAGS += -MMD -O2
CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
CFLAGS += -I../include -I../libgfs2
CFLAGS += -I${incdir}
--- cluster/gfs2/libgfs2/Makefile 2007/08/22 08:58:46 1.9
+++ cluster/gfs2/libgfs2/Makefile 2007/08/28 04:32:48 1.10
@@ -17,7 +17,7 @@
## Bob: add -O2 back in and take -ggdb out
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
-CFLAGS += -Wall -ggdb
+CFLAGS += -ggdb
CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
CFLAGS += -I../include
CFLAGS += -I${incdir}
--- cluster/gfs2/mkfs/Makefile 2007/08/22 08:58:46 1.19
+++ cluster/gfs2/mkfs/Makefile 2007/08/28 04:32:48 1.20
@@ -16,7 +16,7 @@
main_jadd.o
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
-CFLAGS += -Wall -O2 -ggdb
+CFLAGS += -O2 -ggdb
CFLAGS += -I${KERNEL_SRC}/include/
CFLAGS += -I../include/ -I../libgfs2/
CFLAGS += -I${incdir}
--- cluster/gfs2/tool/Makefile 2007/08/22 08:58:46 1.11
+++ cluster/gfs2/tool/Makefile 2007/08/28 04:32:48 1.12
@@ -26,7 +26,7 @@
util.o
CFLAGS += -D_FILE_OFFSET_BITS=64
-CFLAGS += -O2 -Wall
+CFLAGS += -O2
CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
CFLAGS += -I../include
CFLAGS += -I${incdir}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-02-12 5:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-12 5:45 [Cluster-devel] cluster ccs/ccs_tool/Makefile ccs/daemon/Makef fabbione
-- strict thread matches above, loose matches on Subject: below --
2007-08-28 4:32 fabbione
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).