* [Cluster-devel] cluster/cman/cman_tool Makefile
@ 2006-06-12 21:58 cfeist
0 siblings, 0 replies; 3+ messages in thread
From: cfeist @ 2006-06-12 21:58 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: cfeist at sourceware.org 2006-06-12 21:58:13
Modified files:
cman/cman_tool : Makefile
Log message:
Use ccslibdir instead of libdir to find ccs libraries.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
--- cluster/cman/cman_tool/Makefile 2006/02/24 11:38:53 1.13
+++ cluster/cman/cman_tool/Makefile 2006/06/12 21:58:12 1.14
@@ -28,7 +28,7 @@
cp ${TARGET} ${top_srcdir}/bin
cman_tool: main.o join.o ../lib/libcman.a
- $(CC) $(LDFLAGS) -L$(libdir) -o $@ $^ -L../lib -lccs
+ $(CC) $(LDFLAGS) -L$(ccslibdir) -o $@ $^ -L../lib -lccs
main.o: main.c cman_tool.h
$(CC) $(CFLAGS) -c -o $@ $<
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Cluster-devel] cluster/cman/cman_tool Makefile
@ 2006-07-03 8:18 pcaulfield
0 siblings, 0 replies; 3+ messages in thread
From: pcaulfield @ 2006-07-03 8:18 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: pcaulfield at sourceware.org 2006-07-03 08:18:15
Modified files:
cman/cman_tool : Makefile
Log message:
gah! forgot to remove the /cman off the end of SBINDIR
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
--- cluster/cman/cman_tool/Makefile 2006/07/03 07:58:39 1.15
+++ cluster/cman/cman_tool/Makefile 2006/07/03 08:18:15 1.16
@@ -34,7 +34,7 @@
$(CC) $(CFLAGS) -c -o $@ $<
join.o: join.c cman_tool.h
- $(CC) $(CFLAGS) -c -o $@ $< -DSBINDIR=\"${sbindir}/cman\"
+ $(CC) $(CFLAGS) -c -o $@ $< -DSBINDIR=\"${sbindir}\"
install: cman_tool
install -d ${sbindir}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Cluster-devel] cluster/cman/cman_tool Makefile
@ 2006-07-03 12:13 pcaulfield
0 siblings, 0 replies; 3+ messages in thread
From: pcaulfield @ 2006-07-03 12:13 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: pcaulfield at sourceware.org 2006-07-03 12:13:55
Modified files:
cman/cman_tool : Makefile
Log message:
Don't force unwanted flags on people.
honour DEBUG=y
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
--- cluster/cman/cman_tool/Makefile 2006/07/03 08:18:15 1.16
+++ cluster/cman/cman_tool/Makefile 2006/07/03 12:13:55 1.17
@@ -15,10 +15,14 @@
include ${top_srcdir}/make/defines.mk
-CFLAGS+= -g -I${ccsincdir} -I${incdir} -I${top_srcdir}/config \
+CFLAGS+= -I${ccsincdir} -I${incdir} -I${top_srcdir}/config \
-DCMAN_RELEASE_NAME=\"${RELEASE}\" -I../lib
-CFLAGS+=-DDEBUG -fstack-protector -Wp,-D_FORTIFY_SOURCE=2
+ifeq ($(DEBUG),y)
+CFLAGS+= -O0 -g -DDEBUG
+else
+CFLAGS+= -O2
+endif
TARGET=cman_tool
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-07-03 12:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-12 21:58 [Cluster-devel] cluster/cman/cman_tool Makefile cfeist
-- strict thread matches above, loose matches on Subject: below --
2006-07-03 8:18 pcaulfield
2006-07-03 12:13 pcaulfield
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).