![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/Makefile.am b/Makefile.am
index 682e26571fa0edb3ec1463819cf0fa36326cb4d5..f9af841ad765b5ae09a7f25620ade726e71087d2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
## Process this file with automake to produce Makefile.in
-SUBDIRS = src doc share po
+AUTOMAKE_OPTIONS = foreign
-appicondir = $(datadir)/pixmaps
-appicon_DATA = inkscape.png
+SUBDIRS = src doc share po
Graphicsdir = $(datadir)/applications
Graphics_in_files = inkscape.desktop.in
## cp $(srcdir)/AUTHORS $(distdir)
## cp $(srcdir)/NEWS $(distdir)
+DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
man_MANS = inkscape.1 \
inkview.1
EXTRA_DIST = \
+ acinclude.m4 \
fix-roff-punct \
intltool-extract.in \
intltool-merge.in \
inkscape.spec \
Info.plist.in \
Info.plist \
- inkscape.nsi \
- config.h.mingw Makefile.mingw Makefile.mingw.common mingwenv.bat \
- 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 \
+ buildtool.cpp build.xml \
+ README README.ca.txt README.de.txt README.es.txt README.fr.txt README.it.txt README.osx.txt README.pt_BR.txt README.sk.txt README.sr.txt \
TRANSLATORS \
inkscape.png \
- inkscape.ico inkscape16.ico inkscape32-16.ico inkscape32.ico inkscape64.ico \
+ inkscape.ico \
+ mingwenv.bat \
+ src/helper/sp-marshal.cpp.mingw src/helper/sp-marshal.h.mingw \
+ src/2geom/angle.h \
+ src/inkscape-manifest.xml src/inkview-manifest.xml \
cxxtest/COPYING \
cxxtest/cxxtestgen.pl \
cxxtest/cxxtestgen.py \
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-app.sh \
+ packaging/macosx/osx-dmg.sh \
+ packaging/macosx/osx-build.sh \
packaging/macosx/Resources/MenuBar.nib/classes.nib \
packaging/macosx/Resources/MenuBar.nib/info.nib \
packaging/macosx/Resources/MenuBar.nib/objects.xib \
- packaging/macosx/Resources/EPS.icns \
- packaging/macosx/Resources/EPSI.icns \
- packaging/macosx/Resources/Inkscape.icns \
- packaging/macosx/Resources/SVG_plain.icns \
- packaging/macosx/Resources/inkscape_svg.icns \
+ packaging/macosx/Resources/application-gimp-gradient.icns \
+ packaging/macosx/Resources/application-vnd.ms.xaml.icns \
+ packaging/macosx/Resources/image-vnd.sk1.icns \
+ packaging/macosx/Resources/application-illustrator.icns \
+ packaging/macosx/Resources/application-vnd.corel-draw.icns \
+ packaging/macosx/Resources/image-x-eps.icns \
+ packaging/macosx/Resources/Inkscape.icns \
+ packaging/macosx/Resources/image-vnd.dxf.icns \
+ packaging/macosx/Resources/image-svg+xml-compressed.icns \
+ packaging/macosx/Resources/application-pdf.icns \
+ packaging/macosx/Resources/application-vnd.corel-draw-template.icns \
+ packaging/macosx/Resources/application-vnd.corel-draw-compressed.icns \
+ packaging/macosx/Resources/image-svg+xml.icns \
+ packaging/macosx/Resources/image-vnd.windows-metafile.icns \
+ packaging/macosx/Resources/image-x-ps.icns \
+ packaging/macosx/Resources/application-vnd.wordperfect-graphic.icns \
+ packaging/macosx/Resources/application-illustrator-svg.icns \
packaging/macosx/Resources/openDoc \
- packaging/macosx/Resources/postscript.icns \
packaging/macosx/Resources/script \
packaging/macosx/Resources/ProgressWindow.nib/classes.nib \
packaging/macosx/Resources/ProgressWindow.nib/info.nib \
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/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc \
+ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png \
+ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png \
+ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png \
+ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png \
+ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png \
+ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png \
+ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh \
+ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png \
+ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png \
+ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png \
+ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png \
+ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh \
+ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png \
+ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png \
+ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png \
+ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png \
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 \
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/czech.nsh \
- packaging/win32/english.nsh \
- packaging/win32/italian.nsh \
- packaging/win32/german.nsh \
+ packaging/win32/languages/Breton.nsh \
+ packaging/win32/languages/Catalan.nsh \
+ packaging/win32/languages/Czech.nsh \
+ packaging/win32/languages/Dutch.nsh \
+ packaging/win32/languages/English.nsh \
+ packaging/win32/languages/Finnish.nsh \
+ packaging/win32/languages/French.nsh \
+ packaging/win32/languages/Galician.nsh \
+ packaging/win32/languages/German.nsh \
+ packaging/win32/languages/Indonesian.nsh \
+ packaging/win32/languages/Italian.nsh \
+ packaging/win32/languages/Japanese.nsh \
+ packaging/win32/languages/Polish.nsh \
+ packaging/win32/languages/Romanian.nsh \
+ packaging/win32/languages/Russian.nsh \
+ packaging/win32/languages/Slovak.nsh \
+ packaging/win32/languages/Slovenian.nsh \
+ packaging/win32/languages/Spanish.nsh \
+ packaging/win32/languages/SimpChinese.nsh \
+ packaging/win32/languages/TradChinese.nsh \
+ packaging/win32/languages/Ukrainian.nsh \
packaging/win32/header.bmp \
- po/Makefile.mingw \
- src/Makefile.mingw src/inkscape_version.h.mingw src/inkscape.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.
+ packaging/win32/header.svg \
+ packaging/win32/AdvUninstLog.nsh \
+ packaging/win32/AdvUninstLog.txt \
+ packaging/win32/ifexist.nsh \
+ packaging/win32/md5dll.dll \
+ packaging/win32/md5dll.txt \
+ packaging/win32/messagebox.dll \
+ packaging/win32/MessageBox.txt \
+ packaging/win32/RequireLatestNSIS.nsh \
+ packaging/win32/VersionCompleteXXXX.nsh \
+ packaging/win32/welcomefinish.bmp \
+ packaging/win32/welcomefinish.svg \
+ packaging/win32/portable/help.html \
+ packaging/win32/portable/readme.packaging.txt \
+ packaging/win32/portable/App/readme.txt \
+ packaging/win32/portable/App/AppInfo/appicon.ico \
+ packaging/win32/portable/App/AppInfo/appicon_16.png \
+ packaging/win32/portable/App/AppInfo/appicon_32.png \
+ packaging/win32/portable/App/AppInfo/appinfo.ini \
+ packaging/win32/portable/App/AppInfo/installer.ini \
+ packaging/win32/portable/Other/Help/images/donation_button.png \
+ packaging/win32/portable/Other/Help/images/favicon.ico \
+ packaging/win32/portable/Other/Help/images/help_background_footer.png \
+ packaging/win32/portable/Other/Help/images/help_background_header.png \
+ packaging/win32/portable/Other/Help/images/help_logo_top.png \
+ packaging/win32/portable/Other/Source/InkscapePortable.ini \
+ packaging/win32/portable/Other/Source/InkscapePortable.jpg \
+ packaging/win32/portable/Other/Source/InkscapePortable.nsi \
+ packaging/win32/portable/Other/Source/License.txt \
+ packaging/win32/portable/Other/Source/PortableApps.comInstallerCustom.nsh \
+ packaging/win32/portable/Other/Source/PortableApps.comLauncherLANG_ENGLISH.nsh \
+ packaging/win32/portable/Other/Source/Readme.txt \
+ packaging/win32/portable/Other/Source/ReplaceInFileWithTextReplace.nsh \
+ po/inkscape.pot \
+ po/update_po_files.sh \
+ src/inkscape.rc src/inkview.rc
# 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
| 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 $(srcdir)/po ; intltool-update --pot --output-file=$(distdir)/po/inkscape.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
-.PHONY: warn_markup
+#.PHONY: warn_markup
noinst_DATA = warn_markup
warn_markup:
@if perl $(srcdir)/po/check-markup $(srcdir)/po/*.po; [ $$? = 1 ]; then \