X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.am;h=f9af841ad765b5ae09a7f25620ade726e71087d2;hb=c7cf14ac71346f76ae219ce67fb88c1bd34832e2;hp=bff16f1a55f47f725bd1854d3d9566c787534a9a;hpb=9dbf8173224734e7e9a80b95175030597227e2c4;p=inkscape.git diff --git a/Makefile.am b/Makefile.am index bff16f1a5..f9af841ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,9 +4,6 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src doc share po -appicondir = $(datadir)/pixmaps -appicon_DATA = inkscape.png - Graphicsdir = $(datadir)/applications Graphics_in_files = inkscape.desktop.in Graphics_DATA = $(Graphics_in_files:.desktop.in=.desktop) @@ -19,6 +16,7 @@ Graphics_DATA = $(Graphics_in_files:.desktop.in=.desktop) ## cp $(srcdir)/AUTHORS $(distdir) ## cp $(srcdir)/NEWS $(distdir) +DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall man_MANS = inkscape.1 \ inkview.1 @@ -41,13 +39,15 @@ EXTRA_DIST = \ inkscape.spec \ Info.plist.in \ Info.plist \ - inkscape.nsi \ 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 \ + 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 \ @@ -95,16 +95,23 @@ EXTRA_DIST = \ packaging/macosx/Resources/MenuBar.nib/classes.nib \ packaging/macosx/Resources/MenuBar.nib/info.nib \ packaging/macosx/Resources/MenuBar.nib/objects.xib \ - packaging/macosx/Resources/inkscape_ai.icns \ - packaging/macosx/Resources/inkscape_document.icns \ - packaging/macosx/Resources/inkscape_eps.icns \ - packaging/macosx/Resources/inkscape_epsi.icns \ - packaging/macosx/Resources/inkscape_pdf.icns \ - packaging/macosx/Resources/inkscape_ps.icns \ - packaging/macosx/Resources/inkscape_svg.icns \ - packaging/macosx/Resources/inkscape_svgz.icns \ - packaging/macosx/Resources/inkscape_wmf.icns \ - packaging/macosx/Resources/Inkscape.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/script \ packaging/macosx/Resources/ProgressWindow.nib/classes.nib \ @@ -114,7 +121,6 @@ EXTRA_DIST = \ 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/sync_osx_look.sh \ 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 \ @@ -148,21 +154,61 @@ EXTRA_DIST = \ 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/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 \ + 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 @@ -193,13 +239,13 @@ inkscape.1 inkscape.fr.1: fix-roff-punct Makefile.am AUTHORS utf8-to-roff # man 7 groff_char for further remarks on charset encoding for man pages. po/inkscape.pot: - (cd po ; intltool-update --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 \