[PD-cvs] externals/zexy/src Makefile.in, 1.4, 1.5 configure.ac, 1.7, 1.8 zexy.c, 1.9, 1.10

[IOhannes m zmölnig]

Update of /cvsroot/pure-data/externals/zexy/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24458

Modified Files:
	Makefile.in configure.ac zexy.c 
Log Message:
adapted build-system to not use Make.source any longer but generate SOURCES on the fly
added dependency support


Index: Makefile.in
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.in	9 Jun 2005 12:14:38 -0000	1.4
--- Makefile.in	29 Sep 2005 08:03:16 -0000	1.5
***************
*** 24,33 ****
  
  # ICCFLAGS=-march=pentiumiii -axK
! PDCFLAGS = -g -O2 $(DEFS) $(IFLAGS) $(WFLAGS) $(LFLAGS) $(AFLAGS)
! CFLAGS = $(DEFS) $(IFLAGS) $(WFLAGS) @CFLAGS@
  
  LIBS = @LIBS@
  
! include Make.source
  
  TARGETS = $(SOURCES:.c=.o)
--- 24,34 ----
  
  # ICCFLAGS=-march=pentiumiii -axK
! Z_CFLAGS = $(DEFS) $(IFLAGS) $(WFLAGS) @CFLAGS@ -DPD $(CFLAGS)
! 
! MAKEDEP_FLAGS = @MAKEDEP_FLAGS@
  
  LIBS = @LIBS@
  
! SOURCES=$(sort $(filter %.c, $(wildcard *.c)))
  
  TARGETS = $(SOURCES:.c=.o)
***************
*** 41,49 ****
  	$(STRIP) $(STRIPFLAGS) $(LIBNAME).$(EXT)
  
! .c.o:
! 	$(CC) -c -o $@ $(CFLAGS) -DPD $*.c
! 
! .o.$(EXT):
! 	$(CC) -o $@ $(PDCFLAGS) -DPD $*.o
  
  
--- 42,47 ----
  	$(STRIP) $(STRIPFLAGS) $(LIBNAME).$(EXT)
  
! $(TARGETS): %.o : %.c
! 	$(CC) -c -o $@ $(Z_CFLAGS) $*.c
  
  
***************
*** 53,59 ****
  cleaner: clean
  	-rm -f *~ _* config.*
  
  cleanest: cleaner
! 	-rm -f Makefile ../*.$(EXT) Make.source
  
  distclean: cleanest newmakefile
--- 51,58 ----
  cleaner: clean
  	-rm -f *~ _* config.*
+ 	-rm -f *.d *.d.*
  
  cleanest: cleaner
! 	-rm -f Makefile ../*.$(EXT)
  
  distclean: cleanest newmakefile
***************
*** 82,87 ****
  	echo "	./configure && make">>Makefile
  
! make.source:
! 	echo "SOURCES = \\"> Make.source
! 	echo `ls z_*.c $(LIBNAME).c` >> Make.source
! 	echo >> Make.source
--- 81,97 ----
  	echo "	./configure && make">>Makefile
  
! ## dependencies: as proposed by the GNU-make documentation
! ## see http://www.gnu.org/software/make/manual/html_node/make_47.html#SEC51
! -include $(SOURCES:.c=.d)
! %.d: %.c
! 	@set -e; rm -f $@; \
! 	 $(CC) $(MAKEDEP_FLAGS) $(Z_CFLAGS) $< > $@.$$$$; \
! 	 sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
! 	 rm -f $@.$$$$
! 
! 
! Makefile: Makefile.in configure
! 	./configure
! 
! configure: configure.ac
! 	autoconf
\ No newline at end of file

Index: configure.ac
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** configure.ac	28 Sep 2005 12:18:13 -0000	1.7
--- configure.ac	29 Sep 2005 08:03:16 -0000	1.8
***************
*** 98,101 ****
--- 98,109 ----
  AC_HEADER_TIME
  
+ ### make-depend flags
+ if test "x$ac_cv_c_compiler_gnu" = "xyes"; then
+     AC_SUBST(MAKEDEP_FLAGS, "-MM")
+ else
+     AC_SUBST(MAKEDEP_FLAGS, "-M")
+ fi
+ 
+ 
  dnl Checks for library functions.
  AC_FUNC_MMAP

Index: zexy.c
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/zexy.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** zexy.c	16 Jun 2005 13:09:24 -0000	1.9
--- zexy.c	29 Sep 2005 08:03:16 -0000	1.10
***************
*** 122,126 ****
  }
  
! #include "z_zexy.c"
  
  void zexy_setup(void) 
--- 122,126 ----
  }
  
! void z_zexy_setup(void); /* defined in z_zexy.c */
  
  void zexy_setup(void)