CVSROOT: /cvs/cluster
Module name: cluster
Changes by: [EMAIL PROTECTED] 2007-08-24 14:10:28
Modified files:
dlm/tests/usertest: Makefile
Added files:
dlm/tests : Makefile
Log message:
Add dlm/tests/Makefile
clean up dlm/tests/usertest/Makefile
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tests/Makefile.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tests/usertest/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
/cvs/cluster/cluster/dlm/tests/Makefile,v --> standard output
revision 1.1
--- cluster/dlm/tests/Makefile
+++ - 2007-08-24 14:10:28.400582000 +0000
@@ -0,0 +1,19 @@
+###############################################################################
+###############################################################################
+##
+## Copyright (C) 2007 Red Hat, Inc. All rights reserved.
+##
+## This copyrighted material is made available to anyone wishing to use,
+## modify, copy, or redistribute it subject to the terms and conditions
+## of the GNU General Public License v.2.
+##
+###############################################################################
+###############################################################################
+
+SUBDIRS=usertest
+
+%:
+ set -e && \
+ for i in ${SUBDIRS}; do \
+ ${MAKE} -C $$i $@; \
+ done
--- cluster/dlm/tests/usertest/Makefile 2007/02/01 11:11:51 1.10
+++ cluster/dlm/tests/usertest/Makefile 2007/08/24 14:10:27 1.11
@@ -9,52 +9,28 @@
##
###############################################################################
###############################################################################
-top_srcdir = ../../..
-UNINSTALL=${top_srcdir}/scripts/uninstall.pl
-BINARIES=dlmtest asttest lstest pingtest lvb dlmtest2 flood alternate-lvb
joinleave threads
+include ../../../make/defines.mk
-all: $(BINARIES)
-CFLAGS+=-I${top_srcdir}/dlm/lib -L${top_srcdir}/dlm/lib -g -D_REENTRANT
+TARGETS= dlmtest asttest lstest pingtest lvb dlmtest2 flood alternate-lvb
joinleave threads
-ifneq (${KERNEL_SRC}, )
-CFLAGS += -I${KERNEL_SRC}/include/cluster
-else
-CFLAGS += -I/usr/include/linux/cluster
-endif
-CFLAGS += -I${top_srcdir}/lib/dlm
+all: depends ${TARGETS}
+CFLAGS += -D_REENTRANT
+CFLAGS += -Wall -g
+CFLAGS += -I${dlmincdir}
-dlmtest: dlmtest.c
- $(CC) $(CFLAGS) -o $@ $< -ldlm -lpthread
+LDFLAGS += -L${dlmlibdir} -ldlm -lpthread
-dlmtest2: dlmtest2.c
- $(CC) $(CFLAGS) -o $@ $< -ldlm -lpthread
+depends:
+ $(MAKE) -C ../../lib all
-alternate-lvb: alternate-lvb.c
- $(CC) $(CFLAGS) -o $@ $< -ldlm -lpthread
+%.o: %.c
+ $(CC) $(CFLAGS) -c -o $@ $<
-joinleave: joinleave.c
- $(CC) $(CFLAGS) -Wall -o $@ $< -ldlm -lpthread
-
-flood: flood.c
- $(CC) $(CFLAGS) -o $@ $< -ldlm -lpthread
-
-asttest: asttest.c
- $(CC) $(CFLAGS) -o $@ $< -ldlm -lpthread
-
-lstest: lstest.c
- $(CC) $(CFLAGS) -o $@ $< -ldlm -lpthread
-
-pingtest: pingtest.c
- $(CC) $(CFLAGS) -o $@ $< -ldlm -lpthread
-
-lvb: lvb.c
- $(CC) $(CFLAGS) -o $@ $< -ldlm -lpthread
-
-threads: threads.c
- $(CC) $(CFLAGS) -o $@ $< -ldlm -lpthread
+%: %.o
+ $(CC) -o $@ $^ $(LDFLAGS)
clean:
- rm -f *.o $(BINARIES) *~ core
+ rm -f *.o ${TARGETS} *~ core
