* [Cluster-devel] cluster/fence/agents/xvm Makefile
@ 2006-11-13 20:48 cfeist
0 siblings, 0 replies; 7+ messages in thread
From: cfeist @ 2006-11-13 20:48 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL50
Changes by: cfeist at sourceware.org 2006-11-13 20:48:58
Modified files:
fence/agents/xvm: Makefile
Log message:
Need to include directory for ccs.h header file.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL50&r1=1.3.4.1&r2=1.3.4.2
--- cluster/fence/agents/xvm/Makefile 2006/11/13 16:14:18 1.3.4.1
+++ cluster/fence/agents/xvm/Makefile 2006/11/13 20:48:58 1.3.4.2
@@ -24,7 +24,7 @@
INCLUDE=-I${top_srcdir}/include -I${top_srcdir}/config \
-I/usr/include/openais -I/usr/include/libvirt \
-I/usr/include/nss3 -I/usr/include/nspr4 \
- -I../../../cman/lib
+ -I../../../cman/lib -I../../../ccs/lib
CFLAGS+=-DFENCE_RELEASE_NAME=\"${RELEASE}\" \
-Wall -Werror -Wstrict-prototypes -Wshadow -ggdb -D_GNU_SOURCE
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] cluster/fence/agents/xvm Makefile
@ 2006-11-13 20:50 cfeist
0 siblings, 0 replies; 7+ messages in thread
From: cfeist @ 2006-11-13 20:50 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: cfeist at sourceware.org 2006-11-13 20:50:35
Modified files:
fence/agents/xvm: Makefile
Log message:
Need to include directory for ccs.h header file.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.1&r2=1.3.2.2
--- cluster/fence/agents/xvm/Makefile 2006/11/13 16:14:06 1.3.2.1
+++ cluster/fence/agents/xvm/Makefile 2006/11/13 20:50:34 1.3.2.2
@@ -24,7 +24,7 @@
INCLUDE=-I${top_srcdir}/include -I${top_srcdir}/config \
-I/usr/include/openais -I/usr/include/libvirt \
-I/usr/include/nss3 -I/usr/include/nspr4 \
- -I../../../cman/lib
+ -I../../../cman/lib -I../../../ccs/lib
CFLAGS+=-DFENCE_RELEASE_NAME=\"${RELEASE}\" \
-Wall -Werror -Wstrict-prototypes -Wshadow -ggdb -D_GNU_SOURCE
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] cluster/fence/agents/xvm Makefile
@ 2006-11-13 20:51 cfeist
0 siblings, 0 replies; 7+ messages in thread
From: cfeist @ 2006-11-13 20:51 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: cfeist at sourceware.org 2006-11-13 20:51:57
Modified files:
fence/agents/xvm: Makefile
Log message:
Need to include directory for ccs.h header file.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
--- cluster/fence/agents/xvm/Makefile 2006/11/13 16:13:50 1.4
+++ cluster/fence/agents/xvm/Makefile 2006/11/13 20:51:57 1.5
@@ -24,7 +24,7 @@
INCLUDE=-I${top_srcdir}/include -I${top_srcdir}/config \
-I/usr/include/openais -I/usr/include/libvirt \
-I/usr/include/nss3 -I/usr/include/nspr4 \
- -I../../../cman/lib
+ -I../../../cman/lib -I../../../ccs/lib
CFLAGS+=-DFENCE_RELEASE_NAME=\"${RELEASE}\" \
-Wall -Werror -Wstrict-prototypes -Wshadow -ggdb -D_GNU_SOURCE
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] cluster/fence/agents/xvm Makefile
@ 2006-12-08 19:36 lhh
0 siblings, 0 replies; 7+ messages in thread
From: lhh @ 2006-12-08 19:36 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL4
Changes by: lhh at sourceware.org 2006-12-08 19:36:26
Modified files:
fence/agents/xvm: Makefile
Log message:
Fix copytobin target in xvm directory
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.5.2.1&r2=1.5.2.2
--- cluster/fence/agents/xvm/Makefile 2006/12/01 15:49:38 1.5.2.1
+++ cluster/fence/agents/xvm/Makefile 2006/12/08 19:36:25 1.5.2.2
@@ -53,3 +53,7 @@
fi
install -m755 ${TARGETS} ${sbindir}
+copytobin: all
+ cp ${TARGETS} ${top_srcdir}/bin
+
+
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] cluster/fence/agents/xvm Makefile
@ 2007-06-26 17:32 lhh
0 siblings, 0 replies; 7+ messages in thread
From: lhh @ 2007-06-26 17:32 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: lhh at sourceware.org 2007-06-26 17:32:14
Modified files:
fence/agents/xvm: Makefile
Log message:
Clean up testprog in make clean
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
--- cluster/fence/agents/xvm/Makefile 2007/06/26 17:23:41 1.9
+++ cluster/fence/agents/xvm/Makefile 2007/06/26 17:32:14 1.10
@@ -57,7 +57,7 @@
$(CC) $(CFLAGS) -c -o $@ $<
clean:
- rm -f ${TARGET1} ${TARGET2} *~ *.o
+ rm -f ${TARGET1} ${TARGET2} *~ *.o testprog
testprog:
gcc -o testprog xml.c -I/usr/include/libxml2 -lxml2 \
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] cluster/fence/agents/xvm Makefile
@ 2007-06-27 13:32 lhh
0 siblings, 0 replies; 7+ messages in thread
From: lhh @ 2007-06-27 13:32 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: lhh at sourceware.org 2007-06-27 13:32:56
Modified files:
fence/agents/xvm: Makefile
Log message:
Remove testprog target.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
--- cluster/fence/agents/xvm/Makefile 2007/06/26 17:32:14 1.10
+++ cluster/fence/agents/xvm/Makefile 2007/06/27 13:32:56 1.11
@@ -57,11 +57,7 @@
$(CC) $(CFLAGS) -c -o $@ $<
clean:
- rm -f ${TARGET1} ${TARGET2} *~ *.o testprog
-
-testprog:
- gcc -o testprog xml.c -I/usr/include/libxml2 -lxml2 \
- -DSTANDALONE -ggdb
+ rm -f ${TARGET1} ${TARGET2} *~ *.o
install: all
if [ ! -d ${sbindir} ]; then \
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] cluster/fence/agents/xvm Makefile
@ 2007-07-05 14:27 fabbione
0 siblings, 0 replies; 7+ messages in thread
From: fabbione @ 2007-07-05 14:27 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2007-07-05 14:27:27
Modified files:
fence/agents/xvm: Makefile
Log message:
Overload Makefile to give Lon a build target and keep the style consistent
across.
Most important change (really) is to keep incdir as last or custom incdir
build will break.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
--- cluster/fence/agents/xvm/Makefile 2007/06/27 13:32:56 1.11
+++ cluster/fence/agents/xvm/Makefile 2007/07/05 14:27:27 1.12
@@ -14,7 +14,7 @@
TARGET1= fence_xvm
TARGET2= fence_xvmd
-
+TARGET3= testprog
OBJS1= fence_xvm.o \
ip_lookup.o
@@ -25,6 +25,8 @@
vm_states.o \
xml.o
+OBJS3= xml-standalone.o
+
SHAREDOBJS= mcast.o \
simple_auth.o \
tcp.o \
@@ -35,15 +37,17 @@
CFLAGS += -Wall -Werror -Wstrict-prototypes -Wshadow -ggdb
CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${openaisincdir}
CFLAGS += -I${virtincdir} -I${nssincdir} -I${nsprincdir}
-CFLAGS += -I${incdir}
CFLAGS += `xml2-config --cflags`
+CFLAGS += -I${incdir}
+
+EXTRA_CFLAGS += -DSTANDALONE
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -L${dlmlibdir}
LDFLAGS += -L${nsslibdir} -L${nsprlibdir} -L${libdir}
-LDFLAGS += -lccs -lcman -ldlm -lnss3 -lnspr4
+LDFLAGS += -lccs -lcman -ldlm -lnss3 -lnspr4
EXTRA_LDFLAGS += -L${virtlibdir} -lvirt -L${openaislibdir} -lSaCkpt
-EXTRA_LDFLAGS += `xml2-config --libs`
+XML_LDFLAGS += `xml2-config --libs`
all: ${TARGET1} ${TARGET2}
@@ -51,13 +55,19 @@
$(CC) -o $@ $^ $(LDFLAGS)
${TARGET2}: ${SHAREDOBJS} ${OBJS2}
- $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS)
+ $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(XML_LDFLAGS)
+
+${TARGET3}: ${OBJS3}
+ $(CC) -o $@ $^ $(XML_LDFLAGS)
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+%-standalone.o: %.c
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+
clean:
- rm -f ${TARGET1} ${TARGET2} *~ *.o
+ rm -f ${TARGET1} ${TARGET2} ${TARGET3} *~ *.o
install: all
if [ ! -d ${sbindir} ]; then \
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2007-07-05 14:27 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-05 14:27 [Cluster-devel] cluster/fence/agents/xvm Makefile fabbione
-- strict thread matches above, loose matches on Subject: below --
2007-06-27 13:32 lhh
2007-06-26 17:32 lhh
2006-12-08 19:36 lhh
2006-11-13 20:51 cfeist
2006-11-13 20:50 cfeist
2006-11-13 20:48 cfeist
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).