From d6e8cff18b7895847b3a0890bd2a2b7c3015718e Mon Sep 17 00:00:00 2001
From: Bryan Jurish <mukau@users.sourceforge.net>
Date: Sun, 15 Feb 2009 20:41:13 +0000
Subject: + finished centralization of build logic

svn path=/trunk/externals/moocow/pdstring/; revision=10779
---
 src/Makefile.am | 141 ++++++++++----------------------------------------------
 1 file changed, 25 insertions(+), 116 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 275a330..a215164 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,26 +10,20 @@
 # Options & Subdirectories
 #-----------------------------------------------------------------------
 
-## --- recursion subdirectories
-#SUBDIRS = 
-
-## --- pseudo-deps for '.SUFFIXES'
-SUFFIXES = .@PDEXT@
+##--- common includes
+include $(top_srcdir)/pdexternal.am
 
-#-----------------------------------------------------------------------
-# Flags and variables
-#-----------------------------------------------------------------------
-PDEXT    = @PDEXT@
-EXEEXT   = .@PDEXT@
+##--- recursion subdirectories
+#SUBDIRS = 
 
 #-----------------------------------------------------------------------
-# pd externals (hacked _PROGRAMS target)
+# sources (using PROGRAMS)
 #-----------------------------------------------------------------------
 
-## --- externals
-pdexterns_PROGRAMS = pdstring
+## --- externals (as _PROGRAMS)
+pdexec_PROGRAMS = pdstring
 if WANT_OBJECT_EXTERNALS
- pdexterns_PROGRAMS += \
+ pdexec_PROGRAMS += \
 	any2bytes \
 	bytes2any \
 	bytes2wchars \
@@ -38,7 +32,7 @@ if WANT_OBJECT_EXTERNALS
 	printwchars
 endif
 
-## --- possible externals
+## --- possible single-object externals (as _PROGRAMS)
 EXTRA_PROGRAMS = \
 	pdstring \
 	any2bytes \
@@ -48,6 +42,18 @@ EXTRA_PROGRAMS = \
 	printbytes \
 	printwchars
 
+any2bytes_SOURCES = any2bytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
+bytes2any_SOURCES = bytes2any.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
+bytes2wchars_SOURCES = bytes2wchars.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
+wchars2bytes_SOURCES = wchars2bytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
+printbytes_SOURCES = printbytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
+printwchars_SOURCES = printwchars.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
+pdstring_SOURCES = pdstring.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
+
+#-----------------------------------------------------------------------
+# patches, etc.
+#-----------------------------------------------------------------------
+
 ## --- patches
 pdexterns_DATA = \
 	any2wchars.pd \
@@ -70,24 +76,6 @@ pddoc_DATA = \
 	printwchars-help.pd
 
 
-#-----------------------------------------------------------------------
-# sources
-#-----------------------------------------------------------------------
-
-any2bytes_SOURCES = any2bytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-
-bytes2any_SOURCES = bytes2any.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-
-bytes2wchars_SOURCES = bytes2wchars.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-
-wchars2bytes_SOURCES = wchars2bytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-
-printbytes_SOURCES = printbytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-
-printwchars_SOURCES = printwchars.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-
-pdstring_SOURCES = pdstring.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-
 #-----------------------------------------------------------------------
 # aliases via install hook
 #-----------------------------------------------------------------------
@@ -96,109 +84,30 @@ if WANT_OBJECT_EXTERNALS
 all-local:
 	rm -f any2string.$(PDEXT)
 	rm -f string2any.$(PDEXT)
-#	$(LN_S) any2bytes.$(PDEXT) any2string.$(PDEXT)
-#	$(LN_S) bytes2any.$(PDEXT) string2any.$(PDEXT)
 endif
 
 install-data-hook:
 	rm -f $(pdexternsdir)/any2string.$(PDEXT)
 	rm -f $(pdexternsdir)/string2any.$(PDEXT)
-if WANT_OBJECT_EXTERNALS
-#	$(LN_S) any2bytes.$(PDEXT) $(pdexternsdir)/any2string.$(PDEXT)
-#	$(LN_S) bytes2any.$(PDEXT) $(pdexternsdir)/string2any.$(PDEXT)
-endif
 
 uninstall-local:
 	rm -f $(pdexternsdir)/any2string.$(PDEXT)
 	rm -f $(pdexternsdir)/string2any.$(PDEXT)
 
-
 #-----------------------------------------------------------------------
 # external compilation : flags
+#  + now handled by AX_PD_EXTERNAL
 #-----------------------------------------------------------------------
-DEFS    = @DEFS@
-AFLAGS  = @AFLAGS@
-DFLAGS  = @DFLAGS@
-IFLAGS  = @IFLAGS@
-LFLAGS  = @LFLAGS@
-OFLAGS  = @OFLAGS@
-WFLAGS  = @WFLAGS@
-
-#GLIB_IFLAGS = @GLIB_IFLAGS@
-#GLIB_LFLAGS = @GLIB_LFLAGS@
-
-AM_CPPFLAGS = $(IFLAGS) $(GLIB_IFLAGS) $(DFLAGS)
-AM_CFLAGS   = $(OFLAGS) $(WFLAGS) $(AFLAGS)
-
-AM_LDFLAGS ?= $(LFLAGS)
-
-#pdstring_LDFLAGS = $(LFLAGS)
-#bytes2any_LDFLAGS = $(LFLAGS)
-##string2any_LDFLAGS = $(bytes2any_LDFLAGS)
 
 #-----------------------------------------------------------------------
 # Variables: cleanup
-#-----------------------------------------------------------------------
-## --- mostlyclean: built by 'make' & commonly rebuilt
-#MOSTLYCLEANFILES =
-
-## --- clean: built by 'make'
-CLEANFILES = *.$(PDEXT)
-
-## --- distclean: built by 'configure'
-DISTCLEANFILES = \
-	config.log	\
-	config.cache	\
-	config.status
-
-## -- maintainerclean: built by maintainer / by hand
-MAINTAINERCLEANFILES = *~ \
-	$(PODS:.pod=.txt) \
-	Makefile Makefile.in \
-	aclocal.m4 \
-	configure \
-	install-sh \
-	stamp-h.in \
-	config.h.in
-
-maintainer-clean-local:
-	rm -rf autom4te.cache
-
-#CVSCLEAN_SUBDIRS = $(SUBDIRS)
-
-#CVSCLEANFILES = Makefile.in Makefile
-
+#  + should be handled by pdexternal.am
 
 #-----------------------------------------------------------------------
 # Variables: distribution
-#-----------------------------------------------------------------------
-
-## --- extra distribution files
-EXTRA_DIST = \
-	$(pddoc_DATA) \
-	$(pdexterns_DATA)
-
-## --- recursion subdirectories for 'make dist'
-DIST_SUBDIRS = $(SUBDIRS)
-
-## --- dist-hook: when another 'Makefile.am' is overkill
-#DISTHOOK_DIRS = foo
-#DISTHOOK_FILES = foo/bar.txt foo/baz.txt
-#dist-hook:
-#	for d in $(DISTHOOK_DIRS); do\
-#	  mkdir -p $(distdir)/$$d ;\
-#	done
-#	for f in $(DISTHOOK_FILES); do\
-#	  cp -p $(srcdir)/$$f $(distdir)/$$f ;\
-#	done
-
-#dist-bz2: dist-bzip2 ;
-
+#  + should be handled by pdexternal.am
 
 #-----------------------------------------------------------------------
 # Rules: cleanup
-#-----------------------------------------------------------------------
-.PHONY: cvsclean cvsclean-hook
-
-cvsclean: maintainer-clean ;
+#  + should be handled by pdexternal.am
 
-- 
cgit v1.2.1