X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2FMakefile.am;h=890c0d358516ede6ed16fd422cd57365e1c859bc;hb=78f44c3bf98f8b0b6a6b74ef5aba07c345639d65;hp=007a82634de2fc15a7aae71f2cbf38e5b2b8dcaa;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git

diff --git a/synfig-core/trunk/Makefile.am b/synfig-core/trunk/Makefile.am
index 007a826..890c0d3 100644
--- a/synfig-core/trunk/Makefile.am
+++ b/synfig-core/trunk/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-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 synfig.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 po
@@ -13,7 +13,7 @@ bin_SCRIPTS=synfig-config
 
 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.spec synfig.spec.in 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
+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
@@ -91,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