[Goodies-commits] r1964 - in xfce4-clipman-plugin/trunk: . panel-plugin

[Nick Schermer]

Author: nick
Date: 2006-09-05 17:53:54 +0000 (Tue, 05 Sep 2006)
New Revision: 1964

Modified:
   xfce4-clipman-plugin/trunk/ChangeLog
   xfce4-clipman-plugin/trunk/Makefile.am
   xfce4-clipman-plugin/trunk/panel-plugin/Makefile.am
Log:
* Improve Makefile.am files. Make distcheck works
  without any problems now.


Modified: xfce4-clipman-plugin/trunk/ChangeLog
===================================================================
--- xfce4-clipman-plugin/trunk/ChangeLog	2006-09-05 17:53:30 UTC (rev 1963)
+++ xfce4-clipman-plugin/trunk/ChangeLog	2006-09-05 17:53:54 UTC (rev 1964)
@@ -1,3 +1,8 @@
+2006-09-05 19:16 nick
+
+	* Improve Makefile.am files. Make distcheck works
+	  without any problems now.
+
 2006-09-05 18:23 nick
 
 	* Bump version to 0.5.99.1 (0.6rc1)

Modified: xfce4-clipman-plugin/trunk/Makefile.am
===================================================================
--- xfce4-clipman-plugin/trunk/Makefile.am	2006-09-05 17:53:30 UTC (rev 1963)
+++ xfce4-clipman-plugin/trunk/Makefile.am	2006-09-05 17:53:54 UTC (rev 1964)
@@ -1,8 +1,24 @@
-SUBDIRS = \
-	panel-plugin po
+SUBDIRS =								\
+	panel-plugin 							\
+	po
 
-dist-bz2: dist
-	zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
+AUTOMAKE_OPTIONS =							\
+	1.8								\
+	dist-bzip2
 
-distcheck-bz2: distcheck
-	zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
+distclean-local:
+	rm -rf *.spec *.cache *~
+
+rpm: dist
+	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
+	@rm -f $(PACKAGE)-$(VERSION).tar.gz
+
+EXTRA_DIST =								\
+	intltool-extract.in						\
+	intltool-merge.in						\
+	intltool-update.in
+
+DISTCLEANFILES =							\
+	intltool-extract						\
+	intltool-merge							\
+	intltool-update

Modified: xfce4-clipman-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-clipman-plugin/trunk/panel-plugin/Makefile.am	2006-09-05 17:53:30 UTC (rev 1963)
+++ xfce4-clipman-plugin/trunk/panel-plugin/Makefile.am	2006-09-05 17:53:54 UTC (rev 1964)
@@ -1,36 +1,33 @@
 plugindir = $(libexecdir)/xfce4/panel-plugins
 plugin_PROGRAMS = xfce4-clipman-plugin
 
-xfce4_clipman_plugin_SOURCES = \
-	clipman.h \
-	clipman.c \
-	clipman-dialogs.h \
+xfce4_clipman_plugin_SOURCES =						\
+	clipman.h							\
+	clipman.c							\
+	clipman-dialogs.h						\
 	clipman-dialogs.c
 
-xfce4_clipman_plugin_CFLAGS =	 \
-	-I$(top_srcdir) \
-	@LIBXFCEGUI4_CFLAGS@ \
-	@LIBXFCE4PANEL_CFLAGS@ \
+xfce4_clipman_plugin_CFLAGS =						\
+	-I$(top_srcdir)							\
+	$(LIBXFCEGUI4_CFLAGS)						\
+	$(LIBXFCE4PANEL_CFLAGS)						\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
-xfce4_clipman_plugin_LDFLAGS = \
-	@LIBXFCE4PANEL_LIBS@ \
-	@LIBXFCEGUI4_LIBS@
+xfce4_clipman_plugin_LDADD =						\
+	$(LIBXFCE4PANEL_LIBS)						\
+	$(LIBXFCEGUI4_LIBS)
 
+desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files = clipman.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-	
-desktopdir = $(datadir)/xfce4/panel-plugins
+%.desktop.in: %.desktop.in.in
+	sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST = 				\
+EXTRA_DIST =								\
 	$(desktop_in_in_files)
 
-DISTCLEANFILES =			\
-	$(desktop_DATA) $(desktop_in_files)
-	
-# get full path into .desktop file
-%.desktop.in: %.desktop.in.in
-	sed -e "s^@EXTERNAL_PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
-		$< > $@
+CLEANFILES =								\
+	$(desktop_in_files)						\
+	$(desktop_DATA)