Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-core / tags / stable / Makefile.am

diff --git a/synfig-core/tags/stable/Makefile.am b/synfig-core/tags/stable/Makefile.am
index 6531ab1..890c0d3 100644 (file)
--- a/synfig-core/tags/stable/Makefile.am
+++ b/synfig-core/tags/stable/Makefile.am
@@ -1,17 +1,19 @@
 # $Id$
 
-MAINTAINERCLEANFILES=COPYING INSTALL @PACKAGE_TARNAME@.pc.in @PACKAGE_TARNAME@.tar.gz doxygen.cfg config/config.guess config/config.sub config/ltmain.sh config/ltmain.sh.orig config/ltmain.sh.rej config/install-sh config/mkinstalldirs config/aclocal.m4 config/missing config/texinfo.tex config/depcomp aclocal.m4 config.h.in configure stamp-h.in Makefile.in config.log config.status .doc_stamp .DS_Store @PACKAGE_TARNAME@.spec include/etl_profile.h.in libltdl/COPYING.LIB  libltdl/Makefile.in  libltdl/acinclude.m4  libltdl/config-h.in  libltdl/configure.in  libltdl/ltdl.h libltdl/Makefile.am  libltdl/README       libltdl/aclocal.m4    libltdl/configure    libltdl/ltdl.c        libltdl/stamp-h.in
+MAINTAINERCLEANFILES=COPYING INSTALL synfig.pc synfig-$(VERSION).tar.gz doxygen.cfg config/config.guess config/config.sub config/ltmain.sh config/ltmain.sh.orig config/ltmain.sh.rej config/install-sh config/mkinstalldirs config/aclocal.m4 config/missing config/texinfo.tex config/depcomp aclocal.m4 config.h.in configure stamp-h.in Makefile.in config.log config.status .doc_stamp .DS_Store include/etl_profile.h.in libltdl/COPYING.LIB  libltdl/Makefile.in  libltdl/acinclude.m4  libltdl/config-h.in  libltdl/configure.in  libltdl/ltdl.h libltdl/Makefile.am  libltdl/README       libltdl/aclocal.m4    libltdl/configure    libltdl/ltdl.c        libltdl/stamp-h.in
 
 
-SUBDIRS=libltdl src examples
+SUBDIRS=libltdl src examples po
 
 # Install the pkg-config file:
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = @PACKAGE_TARNAME@.pc
+pkgconfig_DATA = synfig.pc
 
 bin_SCRIPTS=synfig-config
 
-EXTRA_DIST=ChangeLog.old TODO config/subs.m4 bootstrap config/package doc/hw-gfx-mapping.txt win32build.sh macosxbuild.sh win32inst.nsi.in COPYING config/depcomp config/synfig.m4 config/cxx_macros.m4 @PACKAGE_TARNAME@.spec config/project.spec.in config/build.cfg synfig.kdevprj synfig-config.in config/ETL.m4 config/doxygen.cfg.in doxygen.cfg config/pkgconfig.pc.in config/pkgconfig.m4 config/libxml++.m4 @PACKAGE_TARNAME@.pc.in pkg-info/macosx/core-resources/ReadMe.txt pkg-info/macosx/core-resources/Welcome.txt pkg-info/macosx/core-resources/install.sh
+ACLOCAL_AMFLAGS=-I m4
+
+EXTRA_DIST=ChangeLog.old TODO m4/subs.m4 config/package doc/hw-gfx-mapping.txt win32build.sh macosxbuild.sh win32inst.nsi.in COPYING config/depcomp m4/synfig.m4 m4/cxx_macros.m4 synfig.kdevprj synfig-config.in m4/ETL.m4 doxygen.cfg.in doxygen.cfg synfig.pc.in m4/pkgconfig.m4 m4/libxml++.m4 @PACKAGE_TARNAME@.pc.in pkg-info/macosx/core-resources/ReadMe.txt pkg-info/macosx/core-resources/Welcome.txt pkg-info/macosx/core-resources/install.sh
 
 CVS=cvs
 GREP=grep
@@ -89,20 +91,14 @@ listwritemes:
 install-bin:
        make -C src/synfig install-libLTLIBRARIES
 
-win32inst.nsi: $(srcdir)/win32inst.nsi.in
-       ./config.status win32inst.nsi
-
-pkg-info/macosx/synfig-core.info: $(srcdir)/pkg-info/macosx/synfig-core.info.in
-       ./config.status pkg-info/macosx/synfig-core.info
-
 RMDIR=rm -fr
 
 if WIN32_PKG   
 package: all win32inst.nsi
-       cp -fu `which libHalf-4.dll` src/modules/mod_openexr/.libs/
-       cp -fu `which libIlmImf-4.dll` src/modules/mod_openexr/.libs/
-       cp -fu `which libIlmThread-4.dll` src/modules/mod_openexr/.libs/
-       cp -fu `which libIex-4.dll` src/modules/mod_openexr/.libs/
+       cp -fu `which libHalf-6.dll` src/modules/mod_openexr/.libs/
+       cp -fu `which libIlmImf-6.dll` src/modules/mod_openexr/.libs/
+       cp -fu `which libIlmThread-6.dll` src/modules/mod_openexr/.libs/
+       cp -fu `which libIex-6.dll` src/modules/mod_openexr/.libs/
        makensis win32inst.nsi
 else
 if MACOSX_PKG
@@ -115,9 +111,6 @@ endif
 
 run: check
 
-$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-       $(srcdir)/bootstrap
-
 .doc_stamp: doxygen.cfg
        $(DOXYGEN) doxygen.cfg
        touch .doc_stamp