X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2FMakefile.am;h=55f18c088376cd6770158f749f92f123e53edd53;hb=d6fce602bd814544189501172d4945c88db14f5c;hp=c1eaf84ef1b2b050cd2fc30a1bd97d6fc736ca54;hpb=c2fd06582a447241e51ad52527f7d82624ff375b;p=synfig.git

diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am
index c1eaf84..55f18c0 100644
--- a/synfig-studio/trunk/Makefile.am
+++ b/synfig-studio/trunk/Makefile.am
@@ -2,27 +2,27 @@
 
 AUTOMAKE_OPTIONS=dist-zip dist-shar dist-bzip2
 
-MAINTAINERCLEANFILES=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@-@VERSION@.spec
 
-SUBDIRS=images src
+SUBDIRS=src images
 
-EXTRA_DIST=bootstrap config/depcomp config/cxx_macros.m4 @PACKAGE_TARNAME@-@VERSION@.spec config/project.spec.in config/build.cfg sinfg.kdevprj 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@-@VERSION@.spec config/project.spec.in config/build.cfg config/ETL.m4 ChangeLog.old synfigstudio.xml.in
 
 # Desktop entry
 #desktopdir              = $(datadir)/gnome/apps/Graphics
 desktopdir              = $(prefix)/share/applications
-desktop_DATA            = sinfgstudio.desktop
-#desktop_in_files        = sinfgstudio.desktop.in
+desktop_DATA            = synfigstudio.desktop
+#desktop_in_files        = synfigstudio.desktop.in
 #desktop_DATA            = $(desktop_in_files:.desktop.in=.desktop)
 
 # @INTLTOOL_DESKTOP_RULE@
 
 mimedir              = $(prefix)/share/mime-info
-mime_DATA            = sinfgstudio.keys sinfgstudio.mime
+mime_DATA            = synfigstudio.keys synfigstudio.mime
 
 # Icon
 icondir                 = $(datadir)/pixmaps
-icon_DATA               = images/sinfg_icon.png images/sif_icon.png
+icon_DATA               = images/synfig_icon.png images/sif_icon.png
 
 
 CVS=cvs
@@ -30,6 +30,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,24 +55,24 @@ 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
 	-@echo  -- List of pending FIXMEs
 	-@echo
-	-@$(GREP) FIXME -n $(shell find $(top_srcdir) -name '*.[ch]*')
+	-@$(GREP) FIXME -n $(shell find $(top_srcdir) -name '*.[ch]*' | grep -v svn)
 	-@echo
 
 listhacks:
 	-@echo
 	-@echo  -- List of pending HACKs
 	-@echo
-	-@$(GREP) HACK -n $(shell find $(top_srcdir) -name '*.[ch]*')
+	-@$(GREP) HACK -n $(shell find $(top_srcdir) -name '*.[ch]*' | grep -v svn)
 	-@echo
 
 run: check
@@ -73,11 +87,24 @@ $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENC
 win32inst.nsi: $(srcdir)/win32inst.nsi.in
 	./config.status win32inst.nsi
 
-installer: all win32inst.nsi
-	convert images/about_dialog.png images/about_dialog.bmp
+package-win32: all win32inst.nsi
+	convert images/installer_logo.png images/installer_logo.bmp
 	make -C images sif_icon.ico
 	makensis win32inst.nsi
 
+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
+if WIN32_PKG	
+package: package-win32
+else
+if MACOSX_PKG
+package: package-osx
+endif
+endif
+
 html: .doc_stamp
 
 rtf: .doc_stamp