All of lore.kernel.org
 help / color / mirror / Atom feed
From: fabbione@sourceware.org <fabbione@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster/ccs Makefile daemon/Makefile
Date: 2 May 2007 12:41:50 -0000	[thread overview]
Message-ID: <20070502124150.19855.qmail@sourceware.org> (raw)

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-05-02 12:41:50

Modified files:
	ccs            : Makefile 
	ccs/daemon     : Makefile 

Log message:
	both libccs and daemon were building and linking common/log.c.
	Make libccs sucks in log.o and make ccsd link against libccs.
	Also fix ccs top level makefile to build in proper order.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11

--- cluster/ccs/Makefile	2007/04/30 11:21:58	1.11
+++ cluster/ccs/Makefile	2007/05/02 12:41:50	1.12
@@ -12,7 +12,7 @@
 
 include ../make/defines.mk
 
-SUBDIRS=daemon lib ccs_test ccs_tool man
+SUBDIRS=lib daemon ccs_test ccs_tool man
 
 all: ${SUBDIRS}
 
--- cluster/ccs/daemon/Makefile	2007/04/30 11:21:59	1.10
+++ cluster/ccs/daemon/Makefile	2007/05/02 12:41:50	1.11
@@ -18,7 +18,6 @@
 	cnx_mgr.o \
 	cluster_mgr.o \
 	misc.o \
-	log.o \
 	globals.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DCCS_RELEASE_NAME=\"${RELEASE}\"
@@ -32,7 +31,8 @@
 CFLAGS += -O2
 endif
 
-LDFLAGS += -L${cmanlibdir} -lcman -L${libdir} `xml2-config --libs` -lpthread -ldl
+LDFLAGS += -L${cmanlibdir} -lcman -L${ccslibdir} -lccs
+LDFLAGS += -L${libdir} `xml2-config --libs` -lpthread -ldl
 
 all: ${TARGET}
 
@@ -42,9 +42,6 @@
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $^
 
-log.c:
-	ln -sf ../common/log.c log.c
-
 install: all
 	install -d ${sbindir}
 	install ${TARGET} ${sbindir}



                 reply	other threads:[~2007-05-02 12:41 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070502124150.19855.qmail@sourceware.org \
    --to=fabbione@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.