X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2FMakefile.am;h=6e648d8d5df24b9e0972b2f6e9d7de0a8bb3136a;hb=57db04e853a864b74971226938e54620b0867662;hp=4b8d0e8c1ee84c432c05f7d46bd40d1001c41478;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am
index 4b8d0e8..6e648d8 100644
--- a/synfig-studio/trunk/Makefile.am
+++ b/synfig-studio/trunk/Makefile.am
@@ -2,11 +2,11 @@
 
 AUTOMAKE_OPTIONS=dist-zip dist-shar dist-bzip2
 
-MAINTAINERCLEANFILES=config/package 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@-@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 synfig.kdevprj config/ETL.m4
+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
 
 # Desktop entry
 #desktopdir              = $(datadir)/gnome/apps/Graphics
@@ -51,14 +51,14 @@ 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,10 +73,20 @@ $(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
+
+#if WIN32_PKG	
+package: all win32inst.nsi
+#	convert images/about_dialog.png images/about_dialog.bmp
 	make -C images sif_icon.ico
 	makensis win32inst.nsi
+#else
+#if MACOSX_PKG
+package: all pkg-info/macosx/synfig-studio.info
+	[ -d pkg_root ] && $(RMDIR) pkg_root || true
+	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
 
 html: .doc_stamp