[foo-cvs] foo/libfoo/src Makefile.am,1.3,1.4

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/libfoo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/src

Modified Files:
	Makefile.am 
Log Message:
minor changes and cleanup to the build system

Index: Makefile.am
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	31 Jul 2004 04:09:20 -0000	1.3
--- Makefile.am	31 Jul 2004 08:10:20 -0000	1.4
***************
*** 35,44 ****
  	$(NULL)
  
! FOO_CFLAGS = @FOO_CFLAGS@
! FOO_OBJCFLAGS = @FOO_OBJCFLAGS@
! FOO_LDFLAGS = @FOO_LDFLAGS@
! FOO_LIBS = @FOO_LIBS@
! 
! if USE_GS_BASE
  include @GNUSTEP_MAKEFILES@/library-combo.make
  include @GNUSTEP_MAKEFILES@/common.make
--- 35,39 ----
  	$(NULL)
  
! if USE_GNUSTEP_BASE
  include @GNUSTEP_MAKEFILES@/library-combo.make
  include @GNUSTEP_MAKEFILES@/common.make
***************
*** 46,56 ****
  endif
  
  libfoo_la_CFLAGS =	$(FOO_CFLAGS)
  libfoo_la_OBJCFLAGS =	$(FOO_OBJCFLAGS) \
! 			$(GNUSTEP_HEADERS_FLAGS) \
! 			$(FND_DEFINE) \
! 			$(AUXILIARY_OBJCFLAGS)
  libfoo_la_LDFLAGS =	$(FOO_LDFLAGS) \
! 			$(GNUSTEP_LIBRARIES_FLAGS)
  libfoo_la_LIBADD =	$(FOO_LIBS) $(FND_LIBS) \
  			-lobjc \
--- 41,54 ----
  endif
  
+ FOO_CFLAGS = @FOO_CFLAGS@
+ FOO_OBJCFLAGS = @FOO_OBJCFLAGS@ @FOO_GNUSTEP_OBJCFLAGS@
+ FOO_LDFLAGS = @FOO_LDFLAGS@ @FOO_GNUSTEP_LDFLAGS@
+ FOO_LIBS = @FOO_LIBS@
+ 
  libfoo_la_CFLAGS =	$(FOO_CFLAGS)
  libfoo_la_OBJCFLAGS =	$(FOO_OBJCFLAGS) \
! 			$(FND_DEFINE)
  libfoo_la_LDFLAGS =	$(FOO_LDFLAGS) \
! 			-version-info @SHARED_VERSION_INFO@
  libfoo_la_LIBADD =	$(FOO_LIBS) $(FND_LIBS) \
  			-lobjc \