[Libsysio-commit] HEAD: libsysio Makefile.am configure.in

[Ruth K. <rk...@us...>]

Update of /cvsroot/libsysio/libsysio
In directory sc8-pr-cvs1:/tmp/cvs-serv17589

Modified Files:
	Makefile.am configure.in 
Log Message:
Changes to support build of one library from sources in all sysio
directories. Automake 1.6 or higher is required. Default location 
of libsysio.a is $(top_srcdir)/lib, but is configurable. 


Index: Makefile.am
===================================================================
RCS file: /cvsroot/libsysio/libsysio/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -b -B -p -r1.8 -r1.9
--- Makefile.am	14 Aug 2003 18:39:32 -0000	1.8
+++ Makefile.am	16 Dec 2003 15:43:14 -0000	1.9
@@ -1,34 +1,46 @@
+AUTOMAKE_OPTIONS=1.6
 
 if WITH_TESTS
-TESTS = tests
+TESTDIR = tests
 else
-TESTS =
+TESTDIR =
 endif
 
-if WITH_CPLANT_TESTS
-SUBDIRS = $(TESTS)
-else
-if WITH_CPLANT_YOD
-SUBDIRS = src drivers dev
-else
-SUBDIRS = src drivers dev $(TESTS)
-endif
-endif
+include $(top_srcdir)/src/module.mk 
+include $(top_srcdir)/include/module.mk
+include $(top_srcdir)/tests/module.mk
+include $(top_srcdir)/dev/stdfd/module.mk 
+include $(top_srcdir)/drivers/incore/module.mk 
+include $(top_srcdir)/drivers/native/module.mk 
+include $(top_srcdir)/drivers/yod/module.mk
+
+lib_LIBRARIES = ${LIBBUILD_DIR}/libsysio.a
 
-EXTRA_DIST = Rules.make \
-	include/dev.h include/file.h include/fs.h include/inode.h \
-	include/mount.h include/sysio.h include/sysio-symbols.h
+__LIBBUILD_DIR__libsysio_a_SOURCES = $(SRCDIR_SRCS) $(STDFD_SRCS) \
+	$(INCORE_SRCS) $(NATIVE_SRCS) $(YOD_SRCS)
 
-really-clean: maintainer-clean
+include $(top_srcdir)/Rules.make
+
+EXTRA_DIST = Rules.make $(TESTS_EXTRA) $(SRCDIR_EXTRA) \
+	$(INCLUDE_EXTRA) $(STDFD_EXTRA) $(INCORE_EXTRA) \
+	$(NATIVE_EXTRA) $(YOD_EXTRA)
+
+AM_CPPFLAGS += ${YOD_DRIVER_FLAGS}
+
+really-clean: testsclean maintainer-clean
 	-rm -rf autom4te-2.53.cache
 	-rm -rf .deps
-	-rm -f Makefile.in \
-		drivers/native/Makefile.in drivers/incore/Makefile.in \
-		drivers/yod/Makefile.in \
-		drivers/Makefile.in \
-		dev/stdfd/Makefile.in \
-		dev/Makefile.in \
-		src/Makefile.in tests/Makefile.in
+	-rm -f Makefile.in 
 	-rm -f compile depcomp INSTALL install-sh missing mkinstalldirs \
 		configure aclocal.m4
 	-rm -f config.guess config.sub
+	-rm -rf $(LIBBUILD_DIR)
+	-rm -f libsysio*.tar.gz
+	cd $(TESTDIR); rm -rf Makefile Makefile.in .deps
+
+tests: $(lib_LIBRARIES) FORCE
+	cd $(TESTDIR); make
+testsclean: FORCE
+	cd $(TESTDIR); make clean
+clean: testsclean clean-am
+FORCE:

Index: configure.in
===================================================================
RCS file: /cvsroot/libsysio/libsysio/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -b -B -p -r1.11 -r1.12
--- configure.in	23 Oct 2003 16:06:13 -0000	1.11
+++ configure.in	16 Dec 2003 15:43:14 -0000	1.12
@@ -10,7 +10,8 @@ case "$host_os" in
 	;;
 esac
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([subdir-objects])
+AM_PROG_CC_C_O
 
 AC_PROG_CC
 AC_PROG_RANLIB
@@ -19,6 +20,25 @@ AC_HEADER_STDC
 AC_HEADER_STAT
 AC_HEADER_TIME
 
+have_lib_dir=yes;
+AC_ARG_WITH(lib-dir,
+  AC_HELP_STRING([--with-lib-dir=<sysio lib build directory>],
+  [directory for sysio library]),
+  [     case "${withval}" in
+         "yes"|"no"|"") have_lib_dir=no ;;
+         *) LIBBUILD_DIR=${withval};
+            test -d ${LIBBUILD_DIR} || mkdir ${LIBBUILD_DIR} ||
+                have_lib_dir=no;;
+        esac;],
+  [ LIBBUILD_DIR=`pwd`/lib;
+    test -d ${LIBBUILD_DIR} || mkdir ${LIBBUILD_DIR} || have_lib_dir=no;])
+if test x${have_lib_dir} == xyes; then
+  echo "Using sysio library directory ${LIBBUILD_DIR}"
+else
+  AC_MSG_ERROR(Need writeable path to sysio library directory ${LIBBUILD_DIR})
+fi
+AC_SUBST(LIBBUILD_DIR)
+
 AC_ARG_WITH(native_driver,
   AC_HELP_STRING([--with-native-driver],[build native test driver]),
   [	case "${withval}" in
@@ -367,12 +387,5 @@ fi
 
 AC_OUTPUT(
 	Makefile
-	src/Makefile
-	drivers/Makefile
-	drivers/native/Makefile
-	drivers/incore/Makefile
-	drivers/yod/Makefile
-	dev/Makefile
-	dev/stdfd/Makefile
 	tests/Makefile)