[Libsysio-commit] HEAD: libsysio Makefile.am

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

Update of /cvsroot/libsysio/libsysio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7921

Modified Files:
	Makefile.am 
Log Message:
Fix some complaints from automake 1.6.
Also use AM_CFLAGS for fPIC flag addition, so that .o names are
not changed.



Index: Makefile.am
===================================================================
RCS file: /cvsroot/libsysio/libsysio/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -b -B -p -r1.12 -r1.13
--- Makefile.am	20 May 2004 19:31:48 -0000	1.12
+++ Makefile.am	2 Jun 2004 22:28:16 -0000	1.13
@@ -47,19 +47,23 @@ else
 OPTIONAL_YOD_SRCS =
 endif
 
+if WITH_LUSTRE_HACK
+OPTIONAL_LUSTRE_SRCDIR_SRCS = $(LUSTRE_SRCDIR_SRCS)
+# it would be better that let configure script check this
+AM_CFLAGS = -fPIC
+else
+OPTIONAL_LUSTRE_SRCDIR_SRCS = 
+endif
+
 __LIBBUILD_DIR__libsysio_a_SOURCES = \
 	$(SRCDIR_SRCS) \
+	$(OPTIONAL_LUSTRE_SRCDIR_SRCS) \
 	$(OPTIONAL_STDFD_SRCS) \
 	$(OPTIONAL_INCORE_SRCS) \
 	$(OPTIONAL_SOCKETS_SRCS) \
 	$(OPTIONAL_NATIVE_SRCS) \
 	$(OPTIONAL_YOD_SRCS)
 
-if WITH_LUSTRE_HACK
-# it would be better that let configure script check this
-__LIBBUILD_DIR__libsysio_a_CFLAGS = -fPIC
-endif
-
 include $(top_srcdir)/Rules.make
 
 EXTRA_DIST = Rules.make misc/init-env.sh $(TESTS_EXTRA) $(SRCDIR_EXTRA) \