[Ocfs2-tools-commits] manish commits r748 - in trunk/ocfs2console: . blkid

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-03-27 17:25:49 -0600 (Sun, 27 Mar 2005)
New Revision: 748

Modified:
   trunk/ocfs2console/Makefile
   trunk/ocfs2console/blkid/Makefile
Log:
Always dist blkid dir


Modified: trunk/ocfs2console/Makefile
===================================================================
--- trunk/ocfs2console/Makefile	2005-03-27 23:17:44 UTC (rev 747)
+++ trunk/ocfs2console/Makefile	2005-03-27 23:25:49 UTC (rev 748)
@@ -2,14 +2,8 @@
 
 include $(TOPDIR)/Preamble.make
 
-ifdef HAVE_BLKID
-BLKID_DIR =
-else
-BLKID_DIR = blkid
-endif
+SUBDIRS = blkid ocfs2interface
 
-SUBDIRS = $(BLKID_DIR) ocfs2interface
-
 MANS = ocfs2console.8
 
 SBIN_EXTRA = ocfs2console

Modified: trunk/ocfs2console/blkid/Makefile
===================================================================
--- trunk/ocfs2console/blkid/Makefile	2005-03-27 23:17:44 UTC (rev 747)
+++ trunk/ocfs2console/blkid/Makefile	2005-03-27 23:25:49 UTC (rev 748)
@@ -8,8 +8,6 @@
 
 INCLUDES = -I..
 
-LIBRARIES = libblkid-internal.a
-
 CFLAGS = $(OPTS) $(WARNINGS) -fPIC
 CPPFLAGS = -DHAVE_UNISTD_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
 	-DHAVE_ERRNO_H=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_LINUX_FD_H=1 \
@@ -35,6 +33,10 @@
 	list.h		\
 	probe.h
 
+ifndef HAVE_BLKID
+
+LIBRARIES = libblkid-internal.a
+
 OBJS = $(subst .c,.o,$(CFILES))
 
 libblkid-internal.a: $(OBJS)
@@ -42,6 +44,8 @@
 	$(AR) r $@ $^
 	$(RANLIB) $@
 
+endif
+
 DIST_FILES = $(CFILES) $(HFILES) ChangeLog
 
 include $(TOPDIR)/Postamble.make