[Goodies-commits] r1963 - in xfce4-weather-plugin/trunk: . panel-plugin

[Nick Schermer]

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

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


Modified: xfce4-weather-plugin/trunk/ChangeLog
===================================================================
--- xfce4-weather-plugin/trunk/ChangeLog	2006-09-05 16:45:20 UTC (rev 1962)
+++ xfce4-weather-plugin/trunk/ChangeLog	2006-09-05 17:53:30 UTC (rev 1963)
@@ -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:27 nick
 
 	* Bump version to 0.5.99.1

Modified: xfce4-weather-plugin/trunk/Makefile.am
===================================================================
--- xfce4-weather-plugin/trunk/Makefile.am	2006-09-05 16:45:20 UTC (rev 1962)
+++ xfce4-weather-plugin/trunk/Makefile.am	2006-09-05 17:53:30 UTC (rev 1963)
@@ -1,13 +1,25 @@
-SUBDIRS = \
-	panel-plugin \
-	po \
+SUBDIRS =								\
+	panel-plugin							\
+	po								\
 	icons
+
+AUTOMAKE_OPTIONS =							\
+	1.8								\
+	dist-bzip2
 	
 distclean-local:
 	rm -rf *.cache *~
 
-dist-bz2: dist
-	zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
+rpm: dist
+	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
+	@rm -f $(PACKAGE)-$(VERSION).tar.gz
 
-distcheck-bz2: distcheck
-	zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
\ No newline at end of file
+EXTRA_DIST =								\
+	intltool-extract.in						\
+	intltool-merge.in						\
+	intltool-update.in
+
+DISTCLEANFILES =							\
+	intltool-extract						\
+	intltool-merge							\
+	intltool-update
\ No newline at end of file

Modified: xfce4-weather-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/Makefile.am	2006-09-05 16:45:20 UTC (rev 1962)
+++ xfce4-weather-plugin/trunk/panel-plugin/Makefile.am	2006-09-05 17:53:30 UTC (rev 1963)
@@ -1,67 +1,56 @@
 plugindir = $(libexecdir)/xfce4/panel-plugins
 plugin_PROGRAMS = xfce4-weather-plugin
 
-xfce4_weather_plugin_SOURCES =					\
-	scrollbox.h						\
-	scrollbox.c						\
-	parsers.h						\
-	parsers.c						\
-	get_data.h						\
-	get_data.c 						\
-	http_client.c						\
-	http_client.h						\
-	plugin.h						\
-	plugin.c						\
-	config_dialog.h						\
-	config_dialog.c						\
-	summary_window.h					\
-	summary_window.c					\
-	icon.h							\
-	icon.c							\
-	search_dialog.h						\
-	search_dialog.c						\
-	translate.h						\
+xfce4_weather_plugin_SOURCES =						\
+	scrollbox.h							\
+	scrollbox.c							\
+	parsers.h							\
+	parsers.c							\
+	get_data.h							\
+	get_data.c 							\
+	http_client.c							\
+	http_client.h							\
+	plugin.h							\
+	plugin.c							\
+	config_dialog.h							\
+	config_dialog.c							\
+	summary_window.h						\
+	summary_window.c						\
+	icon.h								\
+	icon.c								\
+	search_dialog.h							\
+	search_dialog.c							\
+	translate.h							\
 	translate.c
 
-xfce4_weather_plugin_CFLAGS =					\
-        -I$(top_srcdir)                                         \
-	-DTHEMESDIR=\"$(datadir)/xfce4/weather/icons\" 		\
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
-	@LIBXFCE4PANEL_CFLAGS@					\
-	@LIBXFCEGUI4_CFLAGS@					\
-        @LIBXFCE4UTIL_CFLAGS@                                   \
-        @GTK_CFLAGS@                                            \
-	@LIBXML_CFLAGS@
+xfce4_weather_plugin_CFLAGS =						\
+        -I$(top_srcdir)                                         	\
+	-DTHEMESDIR=\"$(datadir)/xfce4/weather/icons\" 			\
+	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
+	$(LIBXFCE4PANEL_CFLAGS)						\
+	$(LIBXFCEGUI4_CFLAGS)						\
+        $(LIBXFCE4UTIL_CFLAGS)                                   	\
+        $(GTK_CFLAGS)                                            	\
+	$(LIBXML_CFLAGS)
 
-xfce4_weather_plugin_LDFLAGS =					\
-        @LIBXFCE4PANEL_LIBS@					\
-        @LIBXFCE4UTIL_LIBS@                                     \
-	@LIBXFCEGUI4_LIBS@					\
-        @GTK_LIBS@                                              \
-	@LIBXML_LIBS@
+xfce4_weather_plugin_LDADD =						\
+        $(LIBXFCE4PANEL_LIBS)						\
+        $(LIBXFCE4UTIL_LIBS)                                     	\
+	$(LIBXFCEGUI4_LIBS)						\
+        $(GTK_LIBS)                                              	\
+	$(LIBXML_LIBS)
 	
-# .desktop file
-#
-# Some automake trickery here. Because we cannot use $(libexecdir) in the
-# automake stage, we'll use sed to get the full path into the .desktop file.
-# We also need to let intltool merge the translated fields, so we add an
-# additional level of indirection: a <name>.desktop.in.in file.
-# 
+desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files = weather.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^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
-		$< > $@
-
+CLEANFILES =								\
+	$(desktop_in_files)						\
+	$(desktop_DATA)