X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2FMakefile.am;h=c718d9cdb1f4f8183ad92e3899140f1c82abf4b5;hb=e95d0a28944d1113c2308da930f3e661cd0a5dc5;hp=61d64466d801023229407b3e2c0e79ebba381e1d;hpb=2867cf6ab83e50625575cbbd0d1da16a5ada3aa3;p=synfig.git

diff --git a/synfig-core/trunk/Makefile.am b/synfig-core/trunk/Makefile.am
index 61d6446..c718d9c 100644
--- a/synfig-core/trunk/Makefile.am
+++ b/synfig-core/trunk/Makefile.am
@@ -1,9 +1,6 @@
-# $Header: /opt/voria/cvs/synfig/Makefile.am,v 1.5 2005/03/24 21:07:24 darco Exp $
+# $Id$
 
-#AUTOMAKE_OPTIONS=dist-zip dist-shar dist-bzip2
-AUTOMAKE_OPTIONS=dist-zip dist-shar
-
-MAINTAINERCLEANFILES=@PACKAGE_TARNAME@.pc.in @PACKAGE_TARNAME@.shar.gz @PACKAGE_TARNAME@.tar.gz @PACKAGE_TARNAME@.zip doxygen.cfg config/config.guess config/config.sub config/ltmain.sh 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@-@VERSION@.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 @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
 
 
 SUBDIRS=libltdl src examples
@@ -14,7 +11,7 @@ pkgconfig_DATA = @PACKAGE_TARNAME@.pc
 
 bin_SCRIPTS=synfig-config
 
-EXTRA_DIST=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 synfig.pbproj/config.h synfig.pbproj/project.pbxproj @PACKAGE_TARNAME@-@VERSION@.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
+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
 
 CVS=cvs
 GREP=grep
@@ -45,6 +42,10 @@ stats:
 	-@du -hcs $(shell find $(top_srcdir)/src -name '*.[ch]*') | $(GREP) total
 	-@echo 
 
+ChangeLog:
+	-svn update
+	svn2cl --include-rev || touch ChangeLog
+
 #tagstable:
 #	$(CVS) tag -F stable
 
@@ -100,6 +101,10 @@ 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/
 	makensis win32inst.nsi
 else
 if MACOSX_PKG