X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.am;h=90b00606c845fa5affc05898f6b17fb5def2c096;hb=7aeb2d2ec5ba26a7059a2dd6f61c6910ed38f8c2;hp=0cee8933be9345ac4eec89fbb1d3611bfc38d42e;hpb=6b400baeb16325af1a049dbe86274b8406c80b75;p=inkscape.git

diff --git a/Makefile.am b/Makefile.am
index 0cee8933b..90b00606c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+AUTOMAKE_OPTIONS = foreign
+
 SUBDIRS = src doc share po
 
 appicondir = $(datadir)/pixmaps
@@ -22,6 +24,7 @@ man_MANS = inkscape.1 \
 		inkview.1
 
 EXTRA_DIST = \
+	acinclude.m4 \
 	fix-roff-punct	\
 	intltool-extract.in	\
 	intltool-merge.in	\
@@ -39,7 +42,7 @@ EXTRA_DIST = \
 	Info.plist.in	\
 	Info.plist		\
 	inkscape.nsi		\
-	config.h.mingw Makefile.mingw Makefile.mingw.common mingwenv.bat	\
+	config.h.mingw Makefile.mingw Makefile.mingw.common mingwenv.bat buildtool.cpp build.xml	\
 	README README.ca.txt README.de.txt README.es.txt README.fr.txt README.it.txt	\
 	HACKING.txt HACKING.de.txt HACKING.fr.txt HACKING.it.txt	\
 	TRANSLATORS \
@@ -83,19 +86,11 @@ EXTRA_DIST = \
 	cxxtest/cxxtest/Win32Gui.h \
 	cxxtest/cxxtest/X11Gui.h \
 	cxxtest/cxxtest/YesNoRunner.h \
-	debian/changelog \
-	debian/compat	\
-	debian/control \
-	debian/copyright	\
-	debian/dirs	\
-	debian/docs	\
-	debian/inkscape.applications	\
-	debian/inkscape.menu	\
-	debian/inkscape.xpm	\
-	debian/mime	\
-	debian/rules	\
 	packaging/autopackage/default.apspec.in	\
 	packaging/osx-app.sh	\
+	packaging/macosx/dmg_background.png	\
+	packaging/macosx/inkscape.ds_store	\
+	packaging/macosx/osx-dmg.sh	\
 	packaging/macosx/Resources/MenuBar.nib/classes.nib	\
 	packaging/macosx/Resources/MenuBar.nib/info.nib	\
 	packaging/macosx/Resources/MenuBar.nib/objects.xib	\
@@ -112,6 +107,7 @@ EXTRA_DIST = \
 	packaging/macosx/Resources/ProgressWindow.nib/objects.xib	\
 	packaging/macosx/Resources/bin/getdisplay.sh	\
 	packaging/macosx/Resources/bin/inkscape	\
+	packaging/macosx/Resources/etc/fonts/fonts.conf	\
 	packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib	\
 	packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib	\
 	packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib	\
@@ -126,25 +122,30 @@ EXTRA_DIST = \
 	packaging/macosx/ScriptExec/MenuBar.nib/info.nib	\
 	packaging/macosx/ScriptExec/MenuBar.nib/objects.xib	\
 	packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj	\
-	packaging/macosx/ScriptExec/ScriptExec.xcode/sveinbjornt.pbxuser	\
-	packaging/macosx/ScriptExec/ScriptExec.xcode/voisine.pbxuser	\
+	packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj \
 	packaging/win32/inkscape.nsi	\
 	packaging/win32/inkscape.nsi.uninstall	\
+	packaging/win32/catalan.nsh	\
 	packaging/win32/czech.nsh	\
 	packaging/win32/english.nsh	\
+	packaging/win32/finnish.nsh	\
+	packaging/win32/french.nsh	\
 	packaging/win32/italian.nsh	\
+	packaging/win32/japanese.nsh	\
+	packaging/win32/polish.nsh	\
 	packaging/win32/german.nsh	\
+	packaging/win32/japanese.nsh	\
+	packaging/win32/russian.nsh	\
+	packaging/win32/slovak.nsh	\
+	packaging/win32/slovenian.nsh	\
+	packaging/win32/spanish.nsh	\
 	packaging/win32/header.bmp	\
 	po/Makefile.mingw \
         po/inkscape.pot \
-	src/Makefile.mingw src/inkscape_version.h.mingw src/inkscape.rc	src/makedef.pl \
+        po/update_po_files.sh \
+	src/Makefile.mingw src/inkscape_version.h.mingw src/inkscape.rc	src/inkview.rc	src/makedef.pl \
 	src/helper/sp-marshal.h.mingw src/helper/sp-marshal.cpp.mingw
 
-# Note: it isn't clear that debian/* belongs in the tar file:
-# tarfile users should be able to use the official Debian packages.
-# They were added to EXTRA_DIST in v1.5, in response to a message on
-# inkscape-devel from "Carlos Ingelmo <carlsalam@te...>" on 2003-11-12 01:35.
-
 # We want the built inkscape.1 to go in the distributed .tar.gz so
 # that .tar.gz users don't need a full perl distribution to get a man
 # page.
@@ -167,9 +168,12 @@ inkscape.1 inkscape.fr.1: fix-roff-punct Makefile.am AUTHORS utf8-to-roff
 	  | perl $(srcdir)/fix-roff-punct \
 	  | perl -CI $(srcdir)/utf8-to-roff	\
 	  > tmp.$$$$ \
-	 && mv tmp.$$$$ $@
+	 && mv -f tmp.$$$$ $@
 # man 7 groff_char for further remarks on charset encoding for man pages.
 
+po/inkscape.pot:
+	(cd po ; intltool-update --pot)
+
 install-data-local: inkscape.fr.1
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/fr/man1
 	$(INSTALL_DATA) `if [ -f inkscape.fr.1 ]; then :; else echo $(srcdir)/;fi`inkscape.fr.1 $(DESTDIR)$(mandir)/fr/man1/inkscape.1