gnome-utils r8332 - in trunk/logview: . data

[cosimoc svn gnome org]

Author: cosimoc
Date: Tue Dec 23 13:28:43 2008
New Revision: 8332
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=8332&view=rev

Log:
Modify Makefile.am files to handle the desktop.in file in data.

Modified:
   trunk/logview/Makefile.am
   trunk/logview/data/Makefile.am

Modified: trunk/logview/Makefile.am
==============================================================================
--- trunk/logview/Makefile.am	(original)
+++ trunk/logview/Makefile.am	Tue Dec 23 13:28:43 2008
@@ -2,8 +2,6 @@
 
 SUBDIRS = data help tests
 
-Utilitiesdir = $(datadir)/applications
-
 INCLUDES = \
 	$(GNOME_UTILS_CFLAGS)					\
 	$(LIBGNOME_CFLAGS)					\
@@ -54,22 +52,12 @@
 
 man_MANS = gnome-system-log.1
 
-Utilities_in_files = gnome-system-log.desktop.in
-Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
-
-$(Utilities_in_files): $(Utilities_in_files:.desktop.in=.desktop.in.in)
-	@sed -e "s|\ VERSION\@|@VERSION@|" $< > $@
-
- INTLTOOL_DESKTOP_RULE@
-
 schemasdir   = $(GCONF_SCHEMA_FILE_DIR)
 schemas_in_file = logview.schemas.in
 schemas_DATA = $(schemas_in_file:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
 EXTRA_DIST = \
-	gnome-system-log.desktop.in.in	\
-	$(schemas_in_file) 		\
 	$(man_MANS)
 
 if GCONF_SCHEMAS_INSTALL
@@ -86,8 +74,6 @@
 install-data-local: install-gconf-schemas
 
 CLEANFILES = 				\
-	gnome-system-log.desktop	\
-	gnome-system-log.desktop.in	\
 	logview.schemas			\
 	$(BUILT_SOURCES)
 

Modified: trunk/logview/data/Makefile.am
==============================================================================
--- trunk/logview/data/Makefile.am	(original)
+++ trunk/logview/data/Makefile.am	Tue Dec 23 13:28:43 2008
@@ -1,4 +1,14 @@
 xmldir = $(pkgdatadir)
 xml_DATA = logview-toolbar.xml
 
-EXTRA_DIST = $(xml_DATA)
+desktopdir = $(datadir)/applications
+desktop_in_files = gnome-system-log.desktop.in.in
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+ INTLTOOL_DESKTOP_RULE@
+
+EXTRA_DIST = 			\
+	$(xml_DATA)		\
+	$(desktop_in_files)	\
+
+DISTCLEANFILES =		\
+	$(desktop_DATA)