From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17705 invoked by alias); 5 Aug 2008 07:37:10 -0000 Received: (qmail 17699 invoked by alias); 5 Aug 2008 07:37:09 -0000 X-Spam-Status: No, hits=-0.5 required=5.0 tests=AWL,BAYES_50,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com X-Spam-Level: Subject: master - build: properly respect non standard libdir and incdir To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: cbc9ece3ea971c17efd260104c4f40e3a855bb5e X-Git-Newrev: 84a2ed735117e161897b50f4f4abab40390d4f66 From: "Fabio M. Di Nitto" Message-Id: <20080805073603.7740E12003F@lists.fedorahosted.org> Date: Wed, 06 Aug 2008 20:38:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00215.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=84a2ed735117e161897b50f4f4abab40390d4f66 Commit: 84a2ed735117e161897b50f4f4abab40390d4f66 Parent: cbc9ece3ea971c17efd260104c4f40e3a855bb5e Author: Fabio M. Di Nitto AuthorDate: Tue Aug 5 09:33:56 2008 +0200 Committer: Fabio M. Di Nitto CommitterDate: Tue Aug 5 09:33:56 2008 +0200 build: properly respect non standard libdir and incdir We allow users to set libdir and incdir to non standard locations. Those values need to be propagated properly within the build system to have a higher priority than system locations but lower than specific paths. Signed-off-by: Fabio M. Di Nitto --- bindings/perl/ccs/Makefile.bindings | 6 ++++-- ccs/ccs_tool/Makefile | 3 ++- ccs/ccsais/Makefile | 1 + ccs/daemon/Makefile | 3 ++- cman/cman_tool/Makefile | 2 +- cman/daemon/Makefile | 2 ++ cman/qdisk/Makefile | 4 ++-- cman/tests/Makefile | 2 +- config/libs/libccsconfdb/Makefile | 1 + config/plugins/ldap/Makefile | 1 + config/plugins/xml/Makefile | 1 + config/tools/ldap/Makefile | 2 +- dlm/libdlm/Makefile | 2 ++ dlm/tests/usertest/Makefile | 3 ++- dlm/tool/Makefile | 2 +- fence/agents/gnbd/Makefile | 2 ++ fence/agents/ipmilan/Makefile | 1 + fence/agents/rackswitch/Makefile | 1 + fence/agents/rps10/Makefile | 1 + fence/agents/xvm/Makefile | 8 ++++---- fence/fence_node/Makefile | 1 + fence/fence_tool/Makefile | 1 + fence/fenced/Makefile | 1 + fence/libfence/Makefile | 1 + gfs/gfs_debug/Makefile | 1 + gfs/gfs_fsck/Makefile | 1 + gfs/gfs_grow/Makefile | 1 + gfs/gfs_jadd/Makefile | 1 + gfs/gfs_mkfs/Makefile | 1 + gfs/gfs_quota/Makefile | 1 + gfs/gfs_tool/Makefile | 1 + gfs/tests/filecon2/Makefile | 2 ++ gfs/tests/mmdd/Makefile | 3 +++ gfs2/convert/Makefile | 1 + gfs2/edit/Makefile | 1 + gfs2/fsck/Makefile | 1 + gfs2/mkfs/Makefile | 1 + gfs2/mount/Makefile | 1 + gfs2/quota/Makefile | 1 + gfs2/tool/Makefile | 1 + gnbd/client/Makefile | 3 ++- gnbd/server/Makefile | 3 ++- gnbd/tools/gnbd_export/Makefile | 3 ++- gnbd/tools/gnbd_import/Makefile | 3 ++- group/dlm_controld/Makefile | 1 + group/gfs_control/Makefile | 1 + group/gfs_controld/Makefile | 1 + group/test/Makefile | 3 +++ group/tool/Makefile | 1 + rgmanager/src/clulib/Makefile | 2 +- rgmanager/src/daemons/Makefile | 15 ++++++++------- rgmanager/src/utils/Makefile | 10 +++++----- 52 files changed, 85 insertions(+), 32 deletions(-) diff --git a/bindings/perl/ccs/Makefile.bindings b/bindings/perl/ccs/Makefile.bindings index 3df4973..9818a89 100644 --- a/bindings/perl/ccs/Makefile.bindings +++ b/bindings/perl/ccs/Makefile.bindings @@ -4,8 +4,10 @@ PMTARGET = CCS.pm TARGET = $(PMTARGET) -CFLAGS=-I${ccsincdir} +CFLAGS += -I${ccsincdir} +CFLAGS += -I${incdir} -LDFLAGS=-L${ccslibdir} -lccs +LDFLAGS += -L${ccslibdir} -lccs +LDFLAGS += -L${libdir} include $(OBJDIR)/make/perl-binding-common.mk diff --git a/ccs/ccs_tool/Makefile b/ccs/ccs_tool/Makefile index f0c7587..8359a9e 100644 --- a/ccs/ccs_tool/Makefile +++ b/ccs/ccs_tool/Makefile @@ -33,7 +33,8 @@ LDDEPS += ../libccscompat/libccscompat.a else LDFLAGS += -L${ccslibdir} -lccs endif -LDFLAGS += `xml2-config --libs` -L${libdir} +LDFLAGS += `xml2-config --libs` +LDFLAGS += -L${libdir} ${TARGET1}: ${OBJS} ${LDDEPS} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/ccs/ccsais/Makefile b/ccs/ccsais/Makefile index 13090bc..f0c5a43 100644 --- a/ccs/ccsais/Makefile +++ b/ccs/ccsais/Makefile @@ -16,6 +16,7 @@ CFLAGS += -I${cmanincdir}/../daemon CFLAGS += -I${incdir} LDFLAGS += -L../libccscompat -lccscompat +LDFLAGS += -L${libdir} LDDEPS += ../libccscompat/libccscompat.a diff --git a/ccs/daemon/Makefile b/ccs/daemon/Makefile index a488dbd..50726df 100644 --- a/ccs/daemon/Makefile +++ b/ccs/daemon/Makefile @@ -23,7 +23,8 @@ CFLAGS += -I${incdir} LDFLAGS += -L${cmanlibdir} -lcman LDFLAGS += -L${openaislibdir} -llogsys -LDFLAGS += -L${libdir} `xml2-config --libs` -lpthread +LDFLAGS += `xml2-config --libs` -lpthread +LDFLAGS += -L${libdir} ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/cman/cman_tool/Makefile b/cman/cman_tool/Makefile index 0d51ab0..df9ebb5 100644 --- a/cman/cman_tool/Makefile +++ b/cman/cman_tool/Makefile @@ -18,7 +18,7 @@ CFLAGS += -I${cmanincdir} CFLAGS += -I${incdir} LDFLAGS += -L${cmanlibdir} -lcman - +LDFLAGS += -L${libdir} ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/cman/daemon/Makefile b/cman/daemon/Makefile index b9c320b..e8c8d02 100644 --- a/cman/daemon/Makefile +++ b/cman/daemon/Makefile @@ -15,6 +15,8 @@ CFLAGS += -fPIC CFLAGS += -I${openaisincdir} CFLAGS += -I${incdir} +LDFLAGS += -L${libdir} + OBJS1= daemon.o \ logging.o \ ais.o \ diff --git a/cman/qdisk/Makefile b/cman/qdisk/Makefile index 87888d3..5625d58 100644 --- a/cman/qdisk/Makefile +++ b/cman/qdisk/Makefile @@ -18,6 +18,7 @@ CFLAGS += -I$(S) CFLAGS += -I${incdir} LDFLAGS += -L${openaislibdir} -llogsys -lpthread +LDFLAGS += -L${libdir} EXTRA_LDFLAGS += -L${cmanlibdir} -L${ccslibdir} -lcman -lccs @@ -34,9 +35,8 @@ SHAREDOBJS= disk.o \ proc.o \ scandisk.o - ${TARGET1}: ${SHAREDOBJS} ${OBJS1} - $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) + $(CC) -o $@ $^ $(EXTRA_LDFLAGS) $(LDFLAGS) ${TARGET2}: ${SHAREDOBJS} ${OBJS2} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/cman/tests/Makefile b/cman/tests/Makefile index 8ad441d..eb800c1 100644 --- a/cman/tests/Makefile +++ b/cman/tests/Makefile @@ -10,7 +10,7 @@ CFLAGS += -I${cmanincdir} CFLAGS += -I${incdir} LDFLAGS += -L${cmanlibdir} -lcman - +LDFLAGS += -L${libdir} depends: $(MAKE) -C ../lib all diff --git a/config/libs/libccsconfdb/Makefile b/config/libs/libccsconfdb/Makefile index 4c0c02b..0ba3034 100644 --- a/config/libs/libccsconfdb/Makefile +++ b/config/libs/libccsconfdb/Makefile @@ -16,3 +16,4 @@ CFLAGS += -I${incdir} LDFLAGS += -L${openaislibdir} -lconfdb LDFLAGS += `xml2-config --libs` +LDFLAGS += -L${libdir} diff --git a/config/plugins/ldap/Makefile b/config/plugins/ldap/Makefile index aff2558..33e907d 100644 --- a/config/plugins/ldap/Makefile +++ b/config/plugins/ldap/Makefile @@ -18,6 +18,7 @@ CFLAGS += -I${ldapincdir} CFLAGS += -I${incdir} LDFLAGS += -L${ldaplibdir} -lldap +LDFLAGS += -L${libdir} OBJS= configldap.o diff --git a/config/plugins/xml/Makefile b/config/plugins/xml/Makefile index 9274336..7e0f147 100644 --- a/config/plugins/xml/Makefile +++ b/config/plugins/xml/Makefile @@ -16,6 +16,7 @@ CFLAGS += -I${cmanincdir}/../daemon CFLAGS += -I${incdir} LDFLAGS += `xml2-config --libs` +LDFLAGS += -L${libdir} OBJS= config.o diff --git a/config/tools/ldap/Makefile b/config/tools/ldap/Makefile index 8fc1de7..79e2032 100644 --- a/config/tools/ldap/Makefile +++ b/config/tools/ldap/Makefile @@ -17,7 +17,7 @@ CFLAGS += -I${openaisincdir} CFLAGS += -I${incdir} LDFLAGS += -L${openaislibdir} -lconfdb - +LDFLAGS += -L${libdir} ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/dlm/libdlm/Makefile b/dlm/libdlm/Makefile index 0cc1f7b..dac48ec 100644 --- a/dlm/libdlm/Makefile +++ b/dlm/libdlm/Makefile @@ -32,6 +32,8 @@ CFLAGS += -I$(S) CFLAGS += -I${incdir} CFLAGS += -I$(KERNEL_SRC)/include +LDFLAGS += -L${libdir} + PTHREAD_LDFLAGS += -lpthread $(TARGET).a: $(TARGET).o $(AISTARGET).o diff --git a/dlm/tests/usertest/Makefile b/dlm/tests/usertest/Makefile index 9e3750f..5e070f7 100644 --- a/dlm/tests/usertest/Makefile +++ b/dlm/tests/usertest/Makefile @@ -7,11 +7,12 @@ include ../../../make/defines.mk include $(OBJDIR)/make/cobj.mk include $(OBJDIR)/make/clean.mk - CFLAGS += -D_REENTRANT CFLAGS += -I${dlmincdir} +CFLAGS += -I${incdir} LDFLAGS += -L${dlmlibdir} -ldlm -lpthread +LDFLAGS += -L${libdir} depends: $(MAKE) -C ../../libdlm all diff --git a/dlm/tool/Makefile b/dlm/tool/Makefile index 6fe8d7f..9d75b6c 100644 --- a/dlm/tool/Makefile +++ b/dlm/tool/Makefile @@ -18,7 +18,7 @@ CFLAGS += -I${incdir} CFLAGS += -I${KERNEL_SRC}/include/ LDFLAGS += -L${dlmlibdir} -L${dlmcontrollibdir} -ldlm -ldlmcontrol - +LDFLAGS += -L${libdir} ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/fence/agents/gnbd/Makefile b/fence/agents/gnbd/Makefile index 054240a..07594a1 100644 --- a/fence/agents/gnbd/Makefile +++ b/fence/agents/gnbd/Makefile @@ -15,6 +15,8 @@ OBJS= main.o CFLAGS += -I$(SRCDIR)/gnbd/tools/gnbd_import CFLAGS += -I${incdir} +LDFLAGS += -L${libdir} + ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/fence/agents/ipmilan/Makefile b/fence/agents/ipmilan/Makefile index dca3455..1c2e9e9 100644 --- a/fence/agents/ipmilan/Makefile +++ b/fence/agents/ipmilan/Makefile @@ -15,6 +15,7 @@ OBJS= expect.o \ CFLAGS += -I${incdir} +LDFLAGS += -L${libdir} ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/fence/agents/rackswitch/Makefile b/fence/agents/rackswitch/Makefile index 147496c..71334d5 100644 --- a/fence/agents/rackswitch/Makefile +++ b/fence/agents/rackswitch/Makefile @@ -14,6 +14,7 @@ OBJS= do_rack.o CFLAGS += -I${incdir} +LDFLAGS += -L${libdir} ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/fence/agents/rps10/Makefile b/fence/agents/rps10/Makefile index 776182e..dd69478 100644 --- a/fence/agents/rps10/Makefile +++ b/fence/agents/rps10/Makefile @@ -16,6 +16,7 @@ OBJS= rps10.o CFLAGS += -I${incdir} +LDFLAGS += -L${libdir} ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/fence/agents/xvm/Makefile b/fence/agents/xvm/Makefile index 6a2d31b..9fd6513 100644 --- a/fence/agents/xvm/Makefile +++ b/fence/agents/xvm/Makefile @@ -38,19 +38,19 @@ CFLAGS += -I${incdir} EXTRA_CFLAGS += -DSTANDALONE -LDFLAGS += -L${nsslibdir} -L${libdir} -LDFLAGS += -lnss3 -L${openaislibdir} -llogsys +LDFLAGS += -L${nsslibdir} -lnss3 +LDFLAGS += -L${openaislibdir} -llogsys +LDFLAGS += -L${libdir} EXTRA_LDFLAGS += -L${ccslibdir} -lccs -L${cmanlibdir} -lcman EXTRA_LDFLAGS += -L${virtlibdir} -lvirt -lSaCkpt XML_LDFLAGS += `xml2-config --libs` - ${TARGET1}: ${SHAREDOBJS} ${OBJS1} $(CC) -o $@ $^ $(LDFLAGS) ${TARGET2}: ${SHAREDOBJS} ${OBJS2} - $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(XML_LDFLAGS) + $(CC) -o $@ $^ $(EXTRA_LDFLAGS) $(XML_LDFLAGS) $(LDFLAGS) ${TARGET3}: ${OBJS3} $(CC) -o $@ $^ $(XML_LDFLAGS) diff --git a/fence/fence_node/Makefile b/fence/fence_node/Makefile index fa6cefd..47a1d42 100644 --- a/fence/fence_node/Makefile +++ b/fence/fence_node/Makefile @@ -21,6 +21,7 @@ CFLAGS += -I${incdir} LDFLAGS += -L${ccslibdir} -L${fencelibdir} -lccs -lfence LDFLAGS += -L${openaislibdir} -llogsys LDFLAGS += -L../libfenced -lfenced +LDFLAGS += -L${libdir} LDDEPS += ../libfenced/libfenced.a diff --git a/fence/fence_tool/Makefile b/fence/fence_tool/Makefile index 23dab29..51413fc 100644 --- a/fence/fence_tool/Makefile +++ b/fence/fence_tool/Makefile @@ -19,6 +19,7 @@ CFLAGS += -I${incdir} LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman LDFLAGS += -L../libfenced -lfenced +LDFLAGS += -L${libdir} LDDEPS += ../libfenced/libfenced.a diff --git a/fence/fenced/Makefile b/fence/fenced/Makefile index 3e3534b..684afb5 100644 --- a/fence/fenced/Makefile +++ b/fence/fenced/Makefile @@ -27,6 +27,7 @@ LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman LDFLAGS += -L${fencelibdir} -lfence LDFLAGS += -L${openaislibdir} -lcpg -llogsys -lpthread LDFLAGS += -L../../group/lib -l group +LDFLAGS += -L${libdir} LDDEPS += ../../group/lib/libgroup.a diff --git a/fence/libfence/Makefile b/fence/libfence/Makefile index 80d9d51..e1e74db 100644 --- a/fence/libfence/Makefile +++ b/fence/libfence/Makefile @@ -14,3 +14,4 @@ CFLAGS += -I${ccsincdir} CFLAGS += -I${incdir} LDFLAGS += -L${ccslibdir} -lccs +LDFLAGS += -L${libdir} diff --git a/gfs/gfs_debug/Makefile b/gfs/gfs_debug/Makefile index 41cebf1..29ce963 100644 --- a/gfs/gfs_debug/Makefile +++ b/gfs/gfs_debug/Makefile @@ -22,6 +22,7 @@ CFLAGS += -I${gfskincdir} CFLAGS += -I$(S)/../include CFLAGS += -I${incdir} +LDFLAGS += -L${libdir} ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/gfs/gfs_fsck/Makefile b/gfs/gfs_fsck/Makefile index abcb721..766ad35 100644 --- a/gfs/gfs_fsck/Makefile +++ b/gfs/gfs_fsck/Makefile @@ -47,6 +47,7 @@ CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM CFLAGS += -I$(S)/../include CFLAGS += -I${incdir} +LDFLAGS += -L${libdir} ${TARGET1}: $(OBJS) $(CC) -o $@ $^ $(LDFLAGS) diff --git a/gfs/gfs_grow/Makefile b/gfs/gfs_grow/Makefile index aba7d81..9c54b12 100644 --- a/gfs/gfs_grow/Makefile +++ b/gfs/gfs_grow/Makefile @@ -19,6 +19,7 @@ CFLAGS += -I$(S)/../include -I$(S)/../libgfs CFLAGS += -I${incdir} LDFLAGS += -L../libgfs -lgfs +LDFLAGS += -L${libdir} LDDEPS += ../libgfs/libgfs.a diff --git a/gfs/gfs_jadd/Makefile b/gfs/gfs_jadd/Makefile index 2efca4a..0d41942 100644 --- a/gfs/gfs_jadd/Makefile +++ b/gfs/gfs_jadd/Makefile @@ -19,6 +19,7 @@ CFLAGS += -I$(S)/../include -I$(S)/../libgfs CFLAGS += -I${incdir} LDFLAGS += -L../libgfs -lgfs +LDFLAGS += -L${libdir} LDDEPS += ../libgfs/libgfs.a diff --git a/gfs/gfs_mkfs/Makefile b/gfs/gfs_mkfs/Makefile index c3c67e7..9174217 100644 --- a/gfs/gfs_mkfs/Makefile +++ b/gfs/gfs_mkfs/Makefile @@ -26,6 +26,7 @@ CFLAGS += -I${incdir} LDFLAGS += -L${volidlibdir} -lvolume_id LDFLAGS += -L../libgfs -lgfs +LDFLAGS += -L${libdir} LDDEPS += ../libgfs/libgfs.a diff --git a/gfs/gfs_quota/Makefile b/gfs/gfs_quota/Makefile index afa6c89..3a4e114 100644 --- a/gfs/gfs_quota/Makefile +++ b/gfs/gfs_quota/Makefile @@ -21,6 +21,7 @@ CFLAGS += -I${gfskincdir} CFLAGS += -I$(S)/../include CFLAGS += -I${incdir} +LDFLAGS += -L${libdir} ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/gfs/gfs_tool/Makefile b/gfs/gfs_tool/Makefile index c045872..31a8cf8 100644 --- a/gfs/gfs_tool/Makefile +++ b/gfs/gfs_tool/Makefile @@ -25,6 +25,7 @@ CFLAGS += -I${gfskincdir} CFLAGS += -I$(S)/../include CFLAGS += -I${incdir} +LDFLAGS += -L${libdir} ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/gfs/tests/filecon2/Makefile b/gfs/tests/filecon2/Makefile index deb57f8..d443a70 100644 --- a/gfs/tests/filecon2/Makefile +++ b/gfs/tests/filecon2/Makefile @@ -9,7 +9,9 @@ include $(OBJDIR)/make/clean.mk CFLAGS += -O3 CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 CFLAGS += -I../../include +CFLAGS += -I${incdir} +LDFLAGS += -L${libdir} %: %.o $(CC) -o $@ $^ $(LDFLAGS) diff --git a/gfs/tests/mmdd/Makefile b/gfs/tests/mmdd/Makefile index aaa037d..eb9cc9e 100644 --- a/gfs/tests/mmdd/Makefile +++ b/gfs/tests/mmdd/Makefile @@ -6,6 +6,9 @@ include ../../../make/defines.mk include $(OBJDIR)/make/clean.mk CFLAGS += -D_GNU_SOURCE +CFLAGS += -I${incdir} + +LDFLAGS += -L${libdir} mmdd.o: mmdd.c $(CC) $(CFLAGS) -D_FILE_OFFSET_BITS=64 -c -o $@ $< diff --git a/gfs2/convert/Makefile b/gfs2/convert/Makefile index 2219d3c..eddb79a 100644 --- a/gfs2/convert/Makefile +++ b/gfs2/convert/Makefile @@ -18,6 +18,7 @@ CFLAGS += -I$(S)/../include -I$(S)/../libgfs2 CFLAGS += -I${incdir} LDFLAGS += -L../libgfs2 -lgfs2 +LDFLAGS += -L${libdir} LDDEPS += ../libgfs2/libgfs2.a diff --git a/gfs2/edit/Makefile b/gfs2/edit/Makefile index e4e63ff..b8a53cc 100644 --- a/gfs2/edit/Makefile +++ b/gfs2/edit/Makefile @@ -22,6 +22,7 @@ CFLAGS += -I${incdir} LDFLAGS += -L${ncurseslibdir} -lncurses LDFLAGS += -L../libgfs2/ -lgfs2 +LDFLAGS += -L${libdir} LDDEPS += ../libgfs2/libgfs2.a diff --git a/gfs2/fsck/Makefile b/gfs2/fsck/Makefile index 8420c9f..0422acc 100644 --- a/gfs2/fsck/Makefile +++ b/gfs2/fsck/Makefile @@ -37,6 +37,7 @@ CFLAGS += -I$(S)/../include -I$(S)/../libgfs2 CFLAGS += -I${incdir} LDFLAGS += -L../libgfs2 -lgfs2 +LDFLAGS += -L${libdir} LDDEPS += ../libgfs2/libgfs2.a diff --git a/gfs2/mkfs/Makefile b/gfs2/mkfs/Makefile index 3c7f74c..e268c38 100644 --- a/gfs2/mkfs/Makefile +++ b/gfs2/mkfs/Makefile @@ -27,6 +27,7 @@ CFLAGS += -I${incdir} LDFLAGS += -L${volidlibdir} -lvolume_id LDFLAGS += -L../libgfs2 -lgfs2 +LDFLAGS += -L${libdir} LDDEPS += ../libgfs2/libgfs2.a diff --git a/gfs2/mount/Makefile b/gfs2/mount/Makefile index 1692855..8706b17 100644 --- a/gfs2/mount/Makefile +++ b/gfs2/mount/Makefile @@ -19,6 +19,7 @@ CFLAGS += -I$(S)/../include CFLAGS += -I${incdir} LDFLAGS += -L../../group/libgfscontrol -lgfscontrol +LDFLAGS += -L${libdir} LDDEPS += ../../group/libgfscontrol/libgfscontrol.a diff --git a/gfs2/quota/Makefile b/gfs2/quota/Makefile index e6c914e..165df2d 100644 --- a/gfs2/quota/Makefile +++ b/gfs2/quota/Makefile @@ -20,6 +20,7 @@ CFLAGS += -I$(S)/../include -I$(S)/../libgfs2 CFLAGS += -I${incdir} LDFLAGS += -L../libgfs2 -lgfs2 +LDFLAGS += -L${libdir} LDDEPS += ../libgfs2/libgfs2.a diff --git a/gfs2/tool/Makefile b/gfs2/tool/Makefile index 459eb01..9012dc8 100644 --- a/gfs2/tool/Makefile +++ b/gfs2/tool/Makefile @@ -24,6 +24,7 @@ CFLAGS += -I$(S)/../include -I$(S)/../libgfs2 CFLAGS += -I${incdir} LDFLAGS += -L../libgfs2 -lgfs2 +LDFLAGS += -L${libdir} LDDEPS += ../libgfs2/libgfs2.a diff --git a/gnbd/client/Makefile b/gnbd/client/Makefile index cd2c9ea..5875000 100644 --- a/gnbd/client/Makefile +++ b/gnbd/client/Makefile @@ -24,7 +24,8 @@ CFLAGS += -I${gnbdkincdir} -I${cmanincdir} CFLAGS += -I$(S)/../include -I$(S)/../server -I$(S)/../utils CFLAGS += -I${incdir} -LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman +LDFLAGS += -L${cmanlibdir} -lcman +LDFLAGS += -L${libdir} ${TARGET1}: ${SHAREDOBJS} ${OBJS1} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/gnbd/server/Makefile b/gnbd/server/Makefile index 3d918b7..90b3b0a 100644 --- a/gnbd/server/Makefile +++ b/gnbd/server/Makefile @@ -29,7 +29,8 @@ CFLAGS += -I${gnbdkincdir} -I${cmanincdir} CFLAGS += -I$(S)/../include -I$(S)/../utils CFLAGS += -I${incdir} -LDFLAGS+= -L${libdir} -L${cmanlibdir} -lcman +LDFLAGS += -L${cmanlibdir} -lcman +LDFLAGS += -L${libdir} ${TARGET1}: ${SHAREDOBJS} ${OBJS1} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/gnbd/tools/gnbd_export/Makefile b/gnbd/tools/gnbd_export/Makefile index 307a8b3..036a271 100644 --- a/gnbd/tools/gnbd_export/Makefile +++ b/gnbd/tools/gnbd_export/Makefile @@ -19,7 +19,8 @@ CFLAGS += -I${gnbdkincdir} -I${cmanincdir} CFLAGS += -I$(S)/../../include -I$(S)/../../server -I$(S)/../../utils CFLAGS += -I${incdir} -LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman +LDFLAGS += -L${cmanlibdir} -lcman +LDFLAGS += -L${libdir} ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/gnbd/tools/gnbd_import/Makefile b/gnbd/tools/gnbd_import/Makefile index 626786e..afba824 100644 --- a/gnbd/tools/gnbd_import/Makefile +++ b/gnbd/tools/gnbd_import/Makefile @@ -20,7 +20,8 @@ CFLAGS += -I$(S)/../../include -I$(S)/../../server CFLAGS += -I$(S)/../../utils -I$(S)/../../client CFLAGS += -I${incdir} -LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman +LDFLAGS += -L${cmanlibdir} -lcman +LDFLAGS += -L${libdir} ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS) diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile index 355f7a6..c4d5e10 100644 --- a/group/dlm_controld/Makefile +++ b/group/dlm_controld/Makefile @@ -34,6 +34,7 @@ LDFLAGS += -L${dlmlibdir} -ldlm LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt -llogsys -lpthread LDFLAGS += -L../../fence/libfenced/ -lfenced LDFLAGS += -L../lib -lgroup +LDFLAGS += -L${libdir} LDDEPS += ../../fence/libfenced/libfenced.a LDDEPS += ../lib/libgroup.a diff --git a/group/gfs_control/Makefile b/group/gfs_control/Makefile index 54d4930..a69860b 100644 --- a/group/gfs_control/Makefile +++ b/group/gfs_control/Makefile @@ -16,6 +16,7 @@ CFLAGS += -I$(S)/../libgfscontrol CFLAGS += -I${incdir} LDFLAGS += -L../libgfscontrol -lgfscontrol +LDFLAGS += -L${libdir} LDDEPS += ../libgfscontrol/libgfscontrol.a diff --git a/group/gfs_controld/Makefile b/group/gfs_controld/Makefile index 8d9241c..6c898c4 100644 --- a/group/gfs_controld/Makefile +++ b/group/gfs_controld/Makefile @@ -33,6 +33,7 @@ LDFLAGS += -L${dlmcontrollibdir} -ldlmcontrol LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt -llogsys -lpthread LDFLAGS += -L../../fence/libfenced/ -lfenced LDFLAGS += -L../lib -lgroup +LDFLAGS += -L${libdir} LDDEPS += ../lib/libgroup.a LDDEPS += ../../fence/libfenced/libfenced.a diff --git a/group/test/Makefile b/group/test/Makefile index 884ffec..3a91013 100644 --- a/group/test/Makefile +++ b/group/test/Makefile @@ -6,6 +6,9 @@ include ../../make/defines.mk include $(OBJDIR)/make/cobj.mk include $(OBJDIR)/make/clean.mk +CFLAGS += -I${incdir} + +LDFLAGS += -L${libdir} %: %.o $(CC) -o $@ $^ $(LDFLAGS) diff --git a/group/tool/Makefile b/group/tool/Makefile index 7043044..ba5d960 100644 --- a/group/tool/Makefile +++ b/group/tool/Makefile @@ -23,6 +23,7 @@ LDFLAGS += -L${dlmcontrollibdir} -ldlmcontrol LDFLAGS += -L../lib -lgroup LDFLAGS += -L../../fence/libfenced -lfenced LDFLAGS += -L../libgfscontrol -lgfscontrol +LDFLAGS += -L${libdir} LDDEPS += ../lib/libgroup.a LDDEPS += ../libgfscontrol/libgfscontrol.a diff --git a/rgmanager/src/clulib/Makefile b/rgmanager/src/clulib/Makefile index 151bfd5..1849536 100644 --- a/rgmanager/src/clulib/Makefile +++ b/rgmanager/src/clulib/Makefile @@ -27,7 +27,7 @@ CFLAGS += -I${incdir} LDFLAGS += -L${cmanlibdir} -lcman LDFLAGS += -L. -lclulib -llalloc LDFLAGS += -lpthread - +LDFLAGS += -L${libdir} ${TARGET1}: ${OBJS1} ${AR} cru $@ $^ diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile index 587273f..876ef70 100644 --- a/rgmanager/src/daemons/Makefile +++ b/rgmanager/src/daemons/Makefile @@ -57,8 +57,8 @@ CFLAGS += -I${incdir} EXTRA_CFLAGS += -DNO_CCS -LDFLAGS += -L${libdir} LDFLAGS += -L../clulib -lclulib +LDFLAGS += -L${libdir} CCS_LDFLAGS += -L${ccslibdir} -lccs CMAN_LDFLAGS += -L${cmanlibdir} -lcman @@ -74,9 +74,10 @@ LDDEPS += ../clulib/libclulib.a LOCAL_LDDEPS += ../clulib/liblalloc.a ${TARGET1}: ${OBJS1} ${LDDEPS} - $(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \ + $(CC) -o $@ $^ $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \ $(DLM_LDFLAGS) $(XML2_LDFLAGS) \ - $(SLANG_LDFLAGS) $(EXTRA_LDFLAGS) + $(SLANG_LDFLAGS) $(EXTRA_LDFLAGS) \ + $(LD_FLAGS) ${TARGET2}: ${OBJS2} ${LDDEPS} $(CC) -o $@ $^ $(LDFLAGS) @@ -96,13 +97,13 @@ ${TARGET2}: ${OBJS2} ${LDDEPS} # packages should run 'make check' as part of the build process. # ${TARGET3}: ${SHAREDOBJS} ${OBJS3} ${LDDEPS} ${LOCAL_LDDEPS} - $(CC) -o $@ $^ $(LDFLAGS) $(CMAN_LDFLAGS) \ - $(LOCAL_LDFLAGS) $(EXTRA_LDFLAGS) $(XML2_LDFLAGS) + $(CC) -o $@ $^ $(CMAN_LDFLAGS) $(LOCAL_LDFLAGS) $(EXTRA_LDFLAGS) \ + $(XML2_LDFLAGS) $(LDFLAGS) ${TARGET4}: ${SHAREDOBJS} ${OBJS4} ${LDDEPS} ${LOCAL_LDDEPS} - $(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \ + $(CC) -o $@ $^ $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \ $(LOCAL_LDFLAGS) $(EXTRA_LDFLAGS) $(XML2_LDFLAGS) \ - $(READLINE_LDFLAGS) + $(READLINE_LDFLAGS) $(LDFLAGS) check: rg_test cd tests && ./runtests.sh diff --git a/rgmanager/src/utils/Makefile b/rgmanager/src/utils/Makefile index 2469032..2bbfc44 100644 --- a/rgmanager/src/utils/Makefile +++ b/rgmanager/src/utils/Makefile @@ -22,8 +22,8 @@ CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${ncursesincdir} CFLAGS += -I$(S)/../../include CFLAGS += -I${incdir} -LDFLAGS += -L${libdir} LDFLAGS += -L../clulib -lclulib +LDFLAGS += -L${libdir} LDDEPS += ../clulib/libclulib.a @@ -45,14 +45,14 @@ ${TARGET2}: ${OBJS2} ${LDDEPS} $(CC) -o $@ $^ $(LDFLAGS) ${TARGET3}: ${OBJS3} ${LDDEPS} - $(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \ - $(NCURSES_LDFLAGS) $(PTHREAD_LDFLAGS) + $(CC) -o $@ $^ $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \ + $(NCURSES_LDFLAGS) $(PTHREAD_LDFLAGS) $(LDFLAGS) ${TARGET4}: ${OBJS4} ${LDDEPS} - $(CC) -o $@ $^ $(LDFLAGS) $(CMAN_LDFLAGS) $(PTHREAD_LDFLAGS) + $(CC) -o $@ $^ $(CMAN_LDFLAGS) $(PTHREAD_LDFLAGS) $(LDFLAGS) ${TARGET5}: ${OBJS5} ${LDDEPS} - $(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) + $(CC) -o $@ $^ $(CCS_LDFLAGS) $(LDFLAGS) ${TARGET6}: cp $(S)/${TARGET6}.sh ${TARGET6}