Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / Makefile.am

diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am
index fa29cd2..af7326c 100644 (file)
--- a/synfig-studio/trunk/Makefile.am
+++ b/synfig-studio/trunk/Makefile.am
@@ -1,17 +1,56 @@
 # $Id$
 
-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
+MAINTAINERCLEANFILES = \
+       COPYING \
+       INSTALL \
+       config/ltmain.sh \
+       doxygen.cfg \
+       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
+
+SUBDIRS = \
+       build_tools \
+       src \
+       images \
+       po
+
+EXTRA_DIST = \
+       COPYING \
+       TODO \
+       m4/subs.m4 \
+       doxygen.cfg.in \
+       doxygen.cfg \
+       macosxbuild.sh \
+       win32build.sh \
+       win32inst.nsi.in \
+       config/package \
+       config/depcomp \
+       m4/cxx_macros.m4 \
+       m4/ETL.m4 \
+       ChangeLog.old \
+       synfigstudio.xml.in \
+       synfigstudio-thumbnailer.schemas.in
 
-SUBDIRS=src images
-
-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
-desktopdir              = $(prefix)/share/applications
-desktop_DATA            = synfigstudio.desktop
-#desktop_in_files        = synfigstudio.desktop.in
-#desktop_DATA            = $(desktop_in_files:.desktop.in=.desktop)
+desktopdir = $(prefix)/share/applications
+desktop_DATA = synfigstudio.desktop
 
 # @INTLTOOL_DESKTOP_RULE@
 
@@ -22,8 +61,8 @@ mime_DATA            = synfigstudio.keys synfigstudio.mime
 icondir                 = $(datadir)/pixmaps
 icon_DATA               = images/synfig_icon.png images/sif_icon.png
 
+ACLOCAL_AMFLAGS=-I m4
 
-CVS=cvs
 GREP=grep
 PRINTF=printf
 SH=sh
@@ -35,14 +74,16 @@ 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"
+       -$(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) mkdir $(SVN_REPOSITORY)/tags/$(TAG) -m "Release Tag: Making directory"
        $(SVN) copy $(top_srcdir) $(SVN_REPOSITORY)/tags/$(TAG) -m "Release $(TAG)"
 
+ChangeLog:
+       -svn update
+       svn2cl --include-rev || touch ChangeLog
+
 stats:
        -@echo
        -@echo  -- Stats
@@ -53,12 +94,6 @@ stats:
        -@du -hcs $(shell find $(top_srcdir)/src -name '*.[ch]*' | $(GREP) -v libavcodec) | $(GREP) total
        -@echo 
 
-#tagstable:
-#      $(CVS) tag -F stable
-
-#tagrelease:
-#      $(CVS) tag -F @PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@
-
 listfixmes:
        -@echo
        -@echo  -- List of pending FIXMEs
@@ -75,16 +110,10 @@ listhacks:
 
 run: check
 
-$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-       $(srcdir)/bootstrap
-
 .doc_stamp: doxygen.cfg
        $(DOXYGEN) doxygen.cfg
        touch .doc_stamp
 
-win32inst.nsi: $(srcdir)/win32inst.nsi.in
-       ./config.status win32inst.nsi
-
 package-win32: all win32inst.nsi
        convert images/installer_logo.png bmp3:images/installer_logo.bmp
        make -C images sif_icon.ico synfig_icon.ico