[Ocfs-tools-commits] jlbec commits r150 - trunk/ocfs2/libocfs2

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-07-08 19:27:21 -0500 (Thu, 08 Jul 2004)
New Revision: 150

Modified:
   trunk/ocfs2/libocfs2/Makefile
   trunk/ocfs2/libocfs2/mkjournal.c
Log:

o Fix DEBUG_EXE makefile foo.



Modified: trunk/ocfs2/libocfs2/Makefile
===================================================================
--- trunk/ocfs2/libocfs2/Makefile	2004-07-08 20:03:00 UTC (rev 149)
+++ trunk/ocfs2/libocfs2/Makefile	2004-07-09 00:27:21 UTC (rev 150)
@@ -32,50 +32,18 @@
 CFLAGS += $(OPTIMIZE)
 
 ifneq ($(OCFS2_DEBUG_EXE),)
-BIN_PROGRAMS += 	\
-	unix_io		\
-	openfs		\
-	inode		\
-	extents		\
-	extent_map	\
-	dir_iterate	\
-	lookup
+DEBUG_EXE_FILES = $(shell awk '/DEBUG_EXE/{if (k[FILENAME] == 0) {print FILENAME; k[FILENAME] = 1;}}' $(CFILES))
+DEBUG_EXE_PROGRAMS = $(addprefix debug_,$(subst .c,,$(DEBUG_EXE_FILES)))
 
-unix_io: unix_io.c libocfs2.a
-	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(LOCAL_CPPFLAGS) \
-		$(INCLUDES) $(DEFINES) $(VERMAGIC) \
-		$(COM_ERR_LIBS) -DDEBUG_EXE -o $@ $^
+BIN_PROGRAMS += $(DEBUG_EXE_PROGRAMS)
 
-openfs: openfs.c libocfs2.a
+debug_%: %.c libocfs2.a
 	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(LOCAL_CPPFLAGS) \
 		$(INCLUDES) $(DEFINES) $(VERMAGIC) \
 		$(COM_ERR_LIBS) -DDEBUG_EXE -o $@ $^
 
-inode: inode.c libocfs2.a
-	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(LOCAL_CPPFLAGS) \
-		$(INCLUDES) $(DEFINES) $(VERMAGIC) \
-		$(COM_ERR_LIBS) -DDEBUG_EXE -o $@ $^
-
-extents: extents.c libocfs2.a
-	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(LOCAL_CPPFLAGS) \
-		$(INCLUDES) $(DEFINES) $(VERMAGIC) \
-		$(COM_ERR_LIBS) -DDEBUG_EXE -o $@ $^
-
-extent_map: extent_map.c libocfs2.a
-	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(LOCAL_CPPFLAGS) \
-		$(INCLUDES) $(DEFINES) $(VERMAGIC) \
-		$(COM_ERR_LIBS) -DDEBUG_EXE -o $@ $^
-
-dir_iterate: dir_iterate.c libocfs2.a
-	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(LOCAL_CPPFLAGS) \
-		$(INCLUDES) $(DEFINES) $(VERMAGIC) \
-		$(COM_ERR_LIBS) -DDEBUG_EXE -o $@ $^
-
-lookup: lookup.c libocfs2.a
-	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(LOCAL_CPPFLAGS) \
-		$(INCLUDES) $(DEFINES) $(VERMAGIC) \
-		$(COM_ERR_LIBS) -DDEBUG_EXE -o $@ $^
 endif
+
 CFILES = 		\
 	unix_io.c	\
 	memory.c	\

Modified: trunk/ocfs2/libocfs2/mkjournal.c
===================================================================
--- trunk/ocfs2/libocfs2/mkjournal.c	2004-07-08 20:03:00 UTC (rev 149)
+++ trunk/ocfs2/libocfs2/mkjournal.c	2004-07-09 00:27:21 UTC (rev 150)
@@ -184,4 +184,11 @@
 	return 0;
 }
 #endif
+
+#include <stdio.h>
+int main(int argc, char *argv[])
+{
+	fprintf(stdout, "Does nothing for now\n");
+	return 0;
+}
 #endif  /* DEBUG_EXE */