From e7bd2d1954b8e9ec7b9d5e3b1dae30ef97d69032 Mon Sep 17 00:00:00 2001
From: Bryan Jurish <mukau@users.sourceforge.net>
Date: Sat, 7 Mar 2009 20:58:22 +0000
Subject: + eliminated build-time dependence on svn:special symlinks

svn path=/trunk/externals/moocow/; revision=10845
---
 deque/src/Makefile.am  |  9 +++++++--
 deque/src/Makefile.in  | 15 ++++++++++-----
 deque/src/mooPdUtils.h |  1 -
 3 files changed, 17 insertions(+), 8 deletions(-)
 delete mode 120000 deque/src/mooPdUtils.h

(limited to 'deque/src')

diff --git a/deque/src/Makefile.am b/deque/src/Makefile.am
index 89477af..effa4d3 100644
--- a/deque/src/Makefile.am
+++ b/deque/src/Makefile.am
@@ -9,7 +9,7 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
 
 #-----------------------------------------------------------------------
 # pd externals (hacked _PROGRAMS target)
@@ -32,7 +32,12 @@ pddoc_DATA = deque-help.pd
 #-----------------------------------------------------------------------
 
 deque_SOURCES = \
-	mooPdUtils.h \
+	$(top_srcdir)/common/mooPdUtils.h \
 	squeue.c squeue.h \
 	dsqueue.c dsqueue.h \
 	deque.c
+
+#-----------------------------------------------------------------------
+# flags
+#-----------------------------------------------------------------------
+AM_CPPFLAGS = -I$(top_srcdir)/common
diff --git a/deque/src/Makefile.in b/deque/src/Makefile.in
index c91b67c..f14a461 100644
--- a/deque/src/Makefile.in
+++ b/deque/src/Makefile.in
@@ -49,12 +49,12 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(top_srcdir)/pdexternal.am
+	$(srcdir)/config.h.in $(top_srcdir)/common/pdexternal.am
 pdexterns_PROGRAMS = deque$(EXEEXT)
 EXTRA_PROGRAMS = deque$(EXEEXT)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -240,17 +240,22 @@ pddoc_DATA = deque-help.pd
 # sources
 #-----------------------------------------------------------------------
 deque_SOURCES = \
-	mooPdUtils.h \
+	$(top_srcdir)/common/mooPdUtils.h \
 	squeue.c squeue.h \
 	dsqueue.c dsqueue.h \
 	deque.c
 
+
+#-----------------------------------------------------------------------
+# flags
+#-----------------------------------------------------------------------
+AM_CPPFLAGS = -I$(top_srcdir)/common
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .@PDEXT@ .pod .txt .html .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -431,7 +436,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/..
+	$(mkdir_p) $(distdir)/../common
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/deque/src/mooPdUtils.h b/deque/src/mooPdUtils.h
deleted file mode 120000
index 0bb3280..0000000
--- a/deque/src/mooPdUtils.h
+++ /dev/null
@@ -1 +0,0 @@
-../../common/mooPdUtils.h
\ No newline at end of file
-- 
cgit v1.2.1