X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2FMakefile.am;h=6b1bbf825afd358c1729a9930111a36b47dfd7bf;hb=6698049b396694fcaf499324b2ea73fc9e71f404;hp=2346db22f1c5cb7b33890a0ac2c3ac57f67b98c6;hpb=18f426c62a55555033ed25ae1b0037638b18553f;p=synfig.git

diff --git a/synfig-core/trunk/Makefile.am b/synfig-core/trunk/Makefile.am
index 2346db2..6b1bbf8 100644
--- a/synfig-core/trunk/Makefile.am
+++ b/synfig-core/trunk/Makefile.am
@@ -1,31 +1,37 @@
-# $Header: /opt/voria/cvs/sinfg/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=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
+SUBDIRS=libltdl src examples po
 
 # Install the pkg-config file:
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = @PACKAGE_TARNAME@.pc
+pkgconfig_DATA = synfig.pc
 
-bin_SCRIPTS=sinfg-config
+bin_SCRIPTS=synfig-config
 
-EXTRA_DIST=bootstrap config/depcomp config/sinfg.m4 config/cxx_macros.m4 sinfg.pbproj/config.h sinfg.pbproj/project.pbxproj @PACKAGE_TARNAME@-@VERSION@.spec config/project.spec.in config/build.cfg sinfg.kdevprj sinfg-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
+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
@@ -78,39 +89,34 @@ listwritemes:
 	-@echo
 
 install-bin:
-	make -C src/sinfg 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
+	make -C src/synfig install-libLTLIBRARIES
 
 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
 package: all pkg-info/macosx/synfig-core.info
 	[ -d pkg_root ] && $(RMDIR) pkg_root || true
-	make install prefix="`pwd`/pkg_root"
+	make install-strip prefix="`pwd`/pkg_root"
 	$(srcdir)/config/package pkg_root pkg-info/macosx/synfig-core.info -r $(srcdir)/pkg-info/macosx/core-resources
 endif
 endif
 
 run: check
 
-$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	$(srcdir)/bootstrap
-
 .doc_stamp: doxygen.cfg
 	$(DOXYGEN) doxygen.cfg
 	touch .doc_stamp
 
 benchmark:
-	sinfg -b -t null -q --time 0 $(srcdir)/examples/*.sif
+	synfig -b -t null -q --time 0 $(srcdir)/examples/*.sif
 
 html: .doc_stamp