Updating branch refs/heads/master
to 6246241983fd68ac19cb265a5ea1c63ba08999c6 (commit)
from eefbf7c8734838c16b809ad4774ad720cfef0391 (commit)
commit 6246241983fd68ac19cb265a5ea1c63ba08999c6
Author: Jérôme Guelfucci <jero...@xfce.org>
Date: Sat Aug 1 13:22:37 2009 +0200
Add the icons' rules to the toplevel Makefile.am.
Fix various regressions due to the switch to a non-recursive Makefile:
make -j was broken (fixed by using LDADD) and the desktop file for the
panel plugin was not installed because of some copy/paste errors.
Still to be done: add the rules for the documentation to the toplevel
Makefile.am.
ChangeLog | 11 +++++++++
Makefile.am | 50 +++++++++++++++++++++++++++++++++----------
configure.ac.in | 4 ---
icons/48x48/Makefile.am | 6 -----
icons/Makefile.am | 17 ---------------
icons/scalable/Makefile.am | 6 -----
6 files changed, 49 insertions(+), 45 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4389b55..ebab5c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,17 @@ Fixed the Indonesian documentation sub-directory, the
autotools scripts were
incomplete.
Updated Italian and Galician documentation translation.
+2009-08-01 jeromeg
+
+Add the icons' rules to the toplevel Makefile.am.
+
+Fix various regressions due to the switch to a non-recursive Makefile:
+make -j was broken (fixed by using LDADD) and the desktop file for the
+panel plugin was not installed because of some copy/paste errors.
+
+Still to be done: add the rules for the documentation to the toplevel
+Makefile.am.
+
2009-07-31 jeromeg
Use a non-recursive Makefile.am to build the sources.
diff --git a/Makefile.am b/Makefile.am
index 0169a90..bb9431a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = subdir-objects
-SUBDIRS = po po-doc icons docs
+SUBDIRS = po po-doc docs
bin_PROGRAMS = src/xfce4-screenshooter
@@ -77,7 +77,7 @@ lib/screenshooter-marshal.c: lib/screenshooter-marshal.list
# Main application
src_xfce4_screenshooter_CFLAGS = \
- -I$(top_srcdir)/lib \
+ -Ilib/ \
@GTK_CFLAGS@ \
@GLIB_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \
@@ -87,16 +87,16 @@ src_xfce4_screenshooter_CFLAGS = \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
src_xfce4_screenshooter_LDFLAGS = \
- $(top_builddir)/lib/libscreenshooter.la \
@GTK_LIBS@ \
@GLIB_LIBS@ \
@GTHREAD_LIBS@ \
@SOUP_LIBS@ \
@LIBXFCE4UTIL_LIBS@ \
@LIBXFCEGUI4_LIBS@
+
+src_xfce4_screenshooter_LDADD = lib/libscreenshooter.la
-src_xfce4_screenshooter_SOURCES = \
- src/main.c
+src_xfce4_screenshooter_SOURCES = src/main.c
# Desktop file for the application
app_desktopdir = $(datadir)/applications
@@ -116,32 +116,56 @@ plugin_PROGRAMS = panel-plugin/xfce4-screenshooter-plugin
panel_plugin_xfce4_screenshooter_plugin_CFLAGS = \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-I$(top_srcdir) \
- -I$(top_srcdir)/lib \
+ -Ilib/ \
@LIBXFCE4PANEL_CFLAGS@ \
@GTHREAD_CFLAGS@ \
@SOUP_CFLAGS@
panel_plugin_xfce4_screenshooter_plugin_LDFLAGS = \
- $(top_builddir)/lib/libscreenshooter.la \
@LIBXFCE4PANEL_LIBS@ \
@GTHREAD_LIBS@ \
@SOUP_LIBS@
+panel_plugin_xfce4_screenshooter_plugin_LDADD = lib/libscreenshooter.la
+
panel_plugin_xfce4_screenshooter_plugin_SOURCES = \
panel-plugin/screenshooter-plugin.c
# Panel plugin desktop file
-panel_desktop_in_in_files = panel-plugin/screenshooter.desktop.in.in
-panel_desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-
panel_desktopdir = $(datadir)/xfce4/panel-plugins
-panel_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+panel_desktop_in_in_files = panel-plugin/screenshooter.desktop.in.in
+panel_desktop_in_files =
$(panel_desktop_in_in_files:.desktop.in.in=.desktop.in)
+panel_desktop_DATA = $(panel_desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
panel-plugin/screenshooter.desktop.in: panel-plugin/screenshooter.desktop.in.in
sed -e "s...@plugin_path@^$(libexecdir)/xfce4/panel-plugins^" \
$< > $@
+# Fallback icons
+
+# 48x48 icons
+48iconsdir = $(datadir)/icons/hicolor/48x48/apps
+48icons_DATA = icons/48x48/applets-screenshooter.png
+
+# Scalable icons
+scaliconsdir = $(datadir)/icons/hicolor/scalable/apps
+scalicons_DATA = icons/scalable/applets-screenshooter.svg
+
+# Update the icon cache
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+ @-if test -z "$(DESTDIR)"; then
\
+ echo "Updating Gtk icon cache.";
\
+ $(gtk_update_icon_cache);
\
+ else
\
+ echo "*** Icon cache not updated. Remember to run:"; \
+ echo "***";
\
+ echo "*** $(gtk_update_icon_cache)";
\
+ echo "***";
\
+ fi
+
# Extra dist and distclean rules
EXTRA_DIST = \
README \
@@ -150,7 +174,9 @@ EXTRA_DIST = \
intltool-update.in \
lib/screenshooter-marshal.list \
$(app_desktop_in_in_files) \
- $(panel_desktop_in_in_files)
+ $(panel_desktop_in_in_files) \
+ $(48icons_DATA) \
+ $(scalicons_DATA)
DISTCLEANFILES = \
intltool-extract \
diff --git a/configure.ac.in b/configure.ac.in
index 4889fc7..3ee979d 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -116,10 +116,6 @@ docs/manual/ja/images/Makefile
docs/manual/tr/Makefile
docs/manual/tr/xfce4-screenshooter.xml
docs/manual/tr/images/Makefile
-icons/Makefile
-icons/48x48/Makefile
-icons/scalable/Makefile
-panel-plugin/Makefile
po/Makefile.in
po-doc/Makefile
])
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
deleted file mode 100755
index 807fd6d..0000000
--- a/icons/48x48/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-iconsdir = $(datadir)/icons/hicolor/48x48/apps
-icons_DATA =
\
- applets-screenshooter.png
-
-EXTRA_DIST =
\
- $(icons_DATA)
diff --git a/icons/Makefile.am b/icons/Makefile.am
deleted file mode 100644
index 2a05e7f..0000000
--- a/icons/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-SUBDIRS =
\
- 48x48
\
- scalable
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
- @-if test -z "$(DESTDIR)"; then
\
- echo "Updating Gtk icon cache.";
\
- $(gtk_update_icon_cache);
\
- else
\
- echo "*** Icon cache not updated. Remember to run:"; \
- echo "***";
\
- echo "*** $(gtk_update_icon_cache)";
\
- echo "***";
\
- fi
-
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
deleted file mode 100644
index 466a567..0000000
--- a/icons/scalable/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-iconsdir = $(datadir)/icons/hicolor/scalable/apps
-icons_DATA =
\
- applets-screenshooter.svg
-
-EXTRA_DIST =
\
- $(icons_DATA)
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
