X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2FMakefile.am;h=fa29cd2d79b58f8cf59d7d3bb38f2de0693511ed;hb=d07a951b5a41e5f1f32226b38dfe912690b7ee1b;hp=6e648d8d5df24b9e0972b2f6e9d7de0a8bb3136a;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git

diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am
index 6e648d8..fa29cd2 100644
--- a/synfig-studio/trunk/Makefile.am
+++ b/synfig-studio/trunk/Makefile.am
@@ -1,12 +1,10 @@
-# $Header: /opt/voria/cvs/studio/Makefile.am,v 1.3 2005/03/24 21:40:05 darco Exp $
+# $Id$
 
-AUTOMAKE_OPTIONS=dist-zip dist-shar dist-bzip2
-
-MAINTAINERCLEANFILES=config/ltmain.sh 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
+MAINTAINERCLEANFILES=config/ltmain.sh 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@.spec
 
 SUBDIRS=src images
 
-EXTRA_DIST=COPYING TODO macosxbuild.sh win32build.sh win32inst.nsi.in bootstrap config/package config/depcomp config/cxx_macros.m4 @PACKAGE_TARNAME@-@VERSION@.spec config/project.spec.in config/build.cfg config/ETL.m4
+EXTRA_DIST=COPYING TODO config/subs.m4 macosxbuild.sh win32build.sh win32inst.nsi.in bootstrap config/package config/depcomp config/cxx_macros.m4 @PACKAGE_TARNAME@.spec config/project.spec.in config/build.cfg config/ETL.m4 ChangeLog.old synfigstudio.xml.in synfigstudio-thumbnailer.schemas.in
 
 # Desktop entry
 #desktopdir              = $(datadir)/gnome/apps/Graphics
@@ -30,6 +28,20 @@ GREP=grep
 PRINTF=printf
 SH=sh
 DOXYGEN=doxygen
+#SVN_REPOSITORY=@SVN_REPOSITORY@
+
+SVN=svn
+TAG=@PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@
+
+
+tagstable:
+	-$(SVN) delete $(SVN_REPOSITORY)/tags/stable -m "Stabe Tag: Removing old tag"
+	$(SVN) mkdir $(SVN_REPOSITORY)/tags/stable -m "Stable Tag: Creating new directory"
+	$(SVN) copy $(top_srcdir) $(SVN_REPOSITORY)/tags/stable -m "Stable Tag: Copying everyhting over"
+
+tagrelease:
+	$(SVN) mkdir $(SVN_REPOSITORY)/tags/$(TAG) -m "Release Tag: Making directory"
+	$(SVN) copy $(top_srcdir) $(SVN_REPOSITORY)/tags/$(TAG) -m "Release $(TAG)"
 
 stats:
 	-@echo
@@ -41,11 +53,11 @@ stats:
 	-@du -hcs $(shell find $(top_srcdir)/src -name '*.[ch]*' | $(GREP) -v libavcodec) | $(GREP) total
 	-@echo 
 
-tagstable:
-	$(CVS) tag -F stable
+#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
@@ -73,20 +85,27 @@ $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENC
 win32inst.nsi: $(srcdir)/win32inst.nsi.in
 	./config.status win32inst.nsi
 
-
-#if WIN32_PKG	
-package: all win32inst.nsi
-#	convert images/about_dialog.png images/about_dialog.bmp
-	make -C images sif_icon.ico
+package-win32: all win32inst.nsi
+	convert images/installer_logo.png bmp3:images/installer_logo.bmp
+	make -C images sif_icon.ico synfig_icon.ico
+	grep -v -e 'installer_logo' -e 'sif_icon' images/images.nsh >images/images.nsh.tmp
+	grep -v -e 'installer_logo' -e 'sif_icon' images/unimages.nsh >images/unimages.nsh.tmp
+	mv -f images/images.nsh.tmp images/images.nsh
+	mv -f images/unimages.nsh.tmp images/unimages.nsh
 	makensis win32inst.nsi
-#else
-#if MACOSX_PKG
-package: all pkg-info/macosx/synfig-studio.info
+
+package-osx: all pkg-info/macosx/synfig-studio.info
 	[ -d pkg_root ] && $(RMDIR) pkg_root || true
+	convert images/installer_logo_osx.png $(srcdir)/pkg-info/macosx/studio-resources/background.tif
 	make install prefix="`pwd`/pkg_root"
 	$(srcdir)/config/package pkg_root pkg-info/macosx/synfig-studio.info -r $(srcdir)/pkg-info/macosx/studio-resources
-#endif
-#endif
+if WIN32_PKG	
+package: package-win32
+else
+if MACOSX_PKG
+package: package-osx
+endif
+endif
 
 html: .doc_stamp