tracker r2692 - in trunk/src: tracker-applet tracker-preferences tracker-search-tool

[mbiebl svn gnome org]

Author: mbiebl
Date: Thu Dec 11 00:26:37 2008
New Revision: 2692
URL: http://svn.gnome.org/viewvc/tracker?rev=2692&view=rev

Log:
Remove unused desktop_in_files variable.

As we process those desktop files as AC_CONFIG_FILES, we don't need the
desktop_in_files variables. This cleans up and simpliefies the Makefile.amS a
bit.


Modified:
   trunk/src/tracker-applet/Makefile.am
   trunk/src/tracker-preferences/Makefile.am
   trunk/src/tracker-search-tool/Makefile.am

Modified: trunk/src/tracker-applet/Makefile.am
==============================================================================
--- trunk/src/tracker-applet/Makefile.am	(original)
+++ trunk/src/tracker-applet/Makefile.am	Thu Dec 11 00:26:37 2008
@@ -33,8 +33,7 @@
 @INTLTOOL_DESKTOP_RULE@
 
 autostartdir = $(sysconfdir)/xdg/autostart
-autostart_in_files = tracker-applet.desktop.in
-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+autostart_DATA = tracker-applet.desktop
 
 pkgdata_DATA = tracker-applet-prefs.glade
 

Modified: trunk/src/tracker-preferences/Makefile.am
==============================================================================
--- trunk/src/tracker-preferences/Makefile.am	(original)
+++ trunk/src/tracker-preferences/Makefile.am	Thu Dec 11 00:26:37 2008
@@ -5,8 +5,7 @@
 bin_PROGRAMS = tracker-preferences
 
 desktopdir = $(datadir)/applications
-desktop_in_files = tracker-preferences.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+desktop_DATA =  tracker-preferences.desktop
 
 pkgdata_DATA = tracker-preferences.glade
 

Modified: trunk/src/tracker-search-tool/Makefile.am
==============================================================================
--- trunk/src/tracker-search-tool/Makefile.am	(original)
+++ trunk/src/tracker-search-tool/Makefile.am	Thu Dec 11 00:26:37 2008
@@ -2,9 +2,6 @@
 
 @INTLTOOL_DESKTOP_RULE@
 
-desktopdir = $(datadir)/applications
-icondir = $(datadir)/tracker/icons
-
 INCLUDES = 	\
 	-I$(top_srcdir)/src/libtracker				\
 	$(GLIB2_CFLAGS)						\
@@ -40,10 +37,10 @@
 	$(top_builddir)/src/libtracker/libtrackerclient.la 
 
 
-desktop_in_files = tracker-search-tool.desktop.in
-desktop_files = $(desktop_in_files:.desktop.in=.desktop)
- 
-desktop_DATA = $(desktop_files)
+desktopdir = $(datadir)/applications
+desktop_DATA = tracker-search-tool.desktop
+
+icondir = $(datadir)/tracker/icons
 icon_DATA = thumbnail_frame.png
 
 EXTRA_DIST = $(icon_DATA)