From e7bd2d1954b8e9ec7b9d5e3b1dae30ef97d69032 Mon Sep 17 00:00:00 2001 From: Bryan Jurish 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 --- weightmap/src/Makefile.am | 6 ++++-- weightmap/src/Makefile.in | 11 ++++++----- weightmap/src/mooPdUtils.h | 1 - 3 files changed, 10 insertions(+), 8 deletions(-) delete mode 120000 weightmap/src/mooPdUtils.h (limited to 'weightmap/src') diff --git a/weightmap/src/Makefile.am b/weightmap/src/Makefile.am index 44a8fda..235e9bb 100644 --- a/weightmap/src/Makefile.am +++ b/weightmap/src/Makefile.am @@ -7,7 +7,7 @@ #----------------------------------------------------------------------- # Includes #----------------------------------------------------------------------- -include $(top_srcdir)/pdexternal.am +include $(top_srcdir)/common/pdexternal.am ## --- recursion subdirectories #SUBDIRS = @@ -34,4 +34,6 @@ pddoc_DATA = weightmap-help.pd # sources #----------------------------------------------------------------------- -weightmap_SOURCES = weightmap.c mooPdUtils.h +weightmap_SOURCES = weightmap.c $(top_srcdir)/common/mooPdUtils.h + +AM_CPPFLAGS = -I$(top_srcdir)/common diff --git a/weightmap/src/Makefile.in b/weightmap/src/Makefile.in index ce53fb0..d1f52e9 100644 --- a/weightmap/src/Makefile.in +++ b/weightmap/src/Makefile.in @@ -47,12 +47,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 = weightmap$(EXEEXT) EXTRA_PROGRAMS = weightmap$(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) @@ -237,13 +237,14 @@ pddoc_DATA = weightmap-help.pd #----------------------------------------------------------------------- # sources #----------------------------------------------------------------------- -weightmap_SOURCES = weightmap.c mooPdUtils.h +weightmap_SOURCES = weightmap.c $(top_srcdir)/common/mooPdUtils.h +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*) \ @@ -422,7 +423,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/weightmap/src/mooPdUtils.h b/weightmap/src/mooPdUtils.h deleted file mode 120000 index 0bb3280..0000000 --- a/weightmap/src/mooPdUtils.h +++ /dev/null @@ -1 +0,0 @@ -../../common/mooPdUtils.h \ No newline at end of file -- cgit v1.2.1