From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30816 invoked by alias); 1 Apr 2009 09:25:52 -0000 Received: (qmail 30810 invoked by alias); 1 Apr 2009 09:25:51 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: fence-agents: master - build: fix nss_wrapper Makefile To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: fence-agents.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 3b6875b351200f38d1ec6e0bd9def3e8a802adb9 X-Git-Newrev: b332199a29ecad045384fcd1388c50c66a9f552f From: "Fabio M. Di Nitto" Message-Id: <20090401092529.C010F120346@lists.fedorahosted.org> Date: Wed, 01 Apr 2009 09:25: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: 2009-q2/txt/msg00001.txt.bz2 Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=b332199a29ecad045384fcd1388c50c66a9f552f Commit: b332199a29ecad045384fcd1388c50c66a9f552f Parent: 3b6875b351200f38d1ec6e0bd9def3e8a802adb9 Author: Fabio M. Di Nitto AuthorDate: Wed Apr 1 11:24:57 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Wed Apr 1 11:24:57 2009 +0200 build: fix nss_wrapper Makefile Cleanup unrequired bits and respect search orders for includes and libraries Signed-off-by: Fabio M. Di Nitto --- fence/agents/nss_wrapper/Makefile | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fence/agents/nss_wrapper/Makefile b/fence/agents/nss_wrapper/Makefile index ae74124..b3a53ae 100644 --- a/fence/agents/nss_wrapper/Makefile +++ b/fence/agents/nss_wrapper/Makefile @@ -10,11 +10,13 @@ include $(OBJDIR)/make/clean.mk include $(OBJDIR)/make/install.mk include $(OBJDIR)/make/uninstall.mk -OBJS= fence_nss_wrapper.o +OBJS= $(TARGET).o -CFLAGS += -I${incdir} -I${nsprincdir} -I${nssincdir} +CFLAGS += -I${nsprincdir} -I${nssincdir} +CFLAGS += -I${incdir} -LDFLAGS += -L${libdir} -L${nsprlibdir} -L${nsslibdir} -lnss3 -lssl3 +LDFLAGS += -L${nsslibdir} -lnss3 -lssl3 +LDFLAGS += -L${libdir} ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS)