2012-09-12 [mones] 3.8.1cvs54
[claws.git] / Makefile.am
index 7eeb31e..f432ee9 100644 (file)
@@ -1,35 +1,54 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2
 
-if PLATFORM_WIN32
-tools = 
-else
-tools = tools
-endif
-
-SUBDIRS = m4 po src $(tools) config doc manual
+SUBDIRS = m4 po src tools config doc manual
 
 EXTRA_DIST = \
        ChangeLog \
        ChangeLog.gtk1 \
+       ChangeLog.pre2.0.0 \
+       ChangeLog.2.0.0-3.0.0 \
        RELEASE_NOTES \
        claws-mail-128x128.png \
        claws-mail-64x64.png \
        claws-mail.pc.in \
        claws-mail.desktop \
        claws-mail.png \
-       autogen.sh
+       autogen.sh \
+       claws-features.h.in
 
-if CLAWS_GNOME2
 # hicolor icon theme, base class of all icon themes
 pixmapdir=$(datadir)/icons/hicolor/48x48/apps
 pixmap_DATA=claws-mail.png
+
+pixmap64dir=$(datadir)/icons/hicolor/64x64/apps
+pixmap64_DATA=claws-mail-64x64.png
+
+pixmap128dir=$(datadir)/icons/hicolor/128x128/apps
+pixmap128_DATA=claws-mail-128x128.png
+
+# when changing the name or location of the .desktop file,
+# also update src/common/Makefile.am
 gnomapdir = $(datadir)/applications
 gnomap_DATA=claws-mail.desktop
 
+rename-icons:
+       @cd $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps && \
+            mv claws-mail-64x64.png claws-mail.png
+       @cd $(DESTDIR)$(datadir)/icons/hicolor/128x128/apps && \
+            mv claws-mail-128x128.png claws-mail.png
+
+remove-icons:
+       rm -f $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/claws-mail.png
+       rm -f $(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/claws-mail.png
+
+if CLAWS_GNOME2
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
-install-data-hook:
+install-data-hook: rename-icons update-icon-cache
+uninstall-hook: remove-icons update-icon-cache
+
+update-icon-cache:
        @-if test -z "$(DESTDIR)"; then                                 \
                 echo "Updating Gtk icon cache.";                       \
                 $(gtk_update_icon_cache);                              \
@@ -39,19 +58,11 @@ install-data-hook:
                 echo "***   $(gtk_update_icon_cache)";                 \
                echo "***";                                             \
         fi
-
 else
-if CLAWS_GNOME
-pixmapdir=$(gnomedatadir)/pixmaps
-pixmap_DATA=claws-mail.png
-gnomapdir=$(gnomedatadir)/gnome/apps/Internet
-gnomap_DATA=claws-mail.desktop
-else
-pixmapdir=
-pixmap_DATA=
-gnomapdir=
-gnomap_DATA=
-endif
+
+install-data-hook: rename-icons
+uninstall-hook: remove-icons
+
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -59,7 +70,7 @@ pkgconfig_DATA = claws-mail.pc
 
 clawsincludedir = $(pkgincludedir)
 clawsinclude_HEADERS = \
-       config.h
+       claws-features.h
 
 relnotesdir = $(docdir)
 relnotes_DATA = RELEASE_NOTES