X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2FMakefile.am;h=6b1bbf825afd358c1729a9930111a36b47dfd7bf;hb=ef6f90fbcc9ee541b6e5822a18754ed2749e9191;hp=49104f4386e879aaeb05f96863f1292b3fded941;hpb=6e37c47f35ba923abea2c34a655cde9959289707;p=synfig.git

diff --git a/synfig-core/trunk/Makefile.am b/synfig-core/trunk/Makefile.am
index 49104f4..6b1bbf8 100644
--- a/synfig-core/trunk/Makefile.am
+++ b/synfig-core/trunk/Makefile.am
@@ -1,31 +1,37 @@
-# $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=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
 
-MAINTAINERCLEANFILES=@PACKAGE_TARNAME@.pc.in @PACKAGE_TARNAME@.shar.gz @PACKAGE_TARNAME@.tar.gz @PACKAGE_TARNAME@.zip doxygen.cfg config/package 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
 
-
-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=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
+ACLOCAL_AMFLAGS=-I m4
 
-CVS=cvs
+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
-
 PRINTF=printf
-
 SH=sh
-
 DOXYGEN=doxygen
 
+SVN=svn
+TAG=@PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@
+
+
+tagstable:
+	-$(SVN) delete $(SVN_REPOSITORY)/tags/stable -m "Stable Tag: Removing old tag"
+	$(SVN) copy $(top_srcdir) $(SVN_REPOSITORY)/tags/stable -m "Stable Tag: Copying everything over"
+
+tagrelease:
+	$(SVN) copy $(top_srcdir) $(SVN_REPOSITORY)/tags/$(TAG) -m "Release $(TAG)"
+
 stats:
 	-@echo
 	-@echo  -- Stats
@@ -36,11 +42,16 @@ stats:
 	-@du -hcs $(shell find $(top_srcdir)/src -name '*.[ch]*') | $(GREP) total
 	-@echo 
 
-tagstable:
-	$(CVS) tag -F stable
+ChangeLog:
+	-svn update
+	svn2cl --include-rev || touch ChangeLog
+
+#tagstable:
+#	$(CVS) tag -F stable
+
+#tagrelease:
+#	$(CVS) tag -F @PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@
 
-tagrelease:
-	$(CVS) tag -F @PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@
 
 listfixmes:
 	-@echo
@@ -80,16 +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/
 	makensis win32inst.nsi
 else
 if MACOSX_PKG
@@ -102,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