tracker r1212 - in trunk/src: libtracker-common tracker-applet tracker-preferences

[mbiebl svn gnome org]

Author: mbiebl
Date: Sat Mar  8 00:39:57 2008
New Revision: 1212
URL: http://svn.gnome.org/viewvc/tracker?rev=1212&view=rev

Log:
- header files, which belong to a binary or library, but are not installed, should
  simply be listed in the _SOURCES target.
  http://sources.redhat.com/automake/automake.html#Headers
- Fix the indentation to match the overall style


Modified:
   trunk/src/libtracker-common/Makefile.am
   trunk/src/tracker-applet/Makefile.am
   trunk/src/tracker-preferences/Makefile.am

Modified: trunk/src/libtracker-common/Makefile.am
==============================================================================
--- trunk/src/libtracker-common/Makefile.am	(original)
+++ trunk/src/libtracker-common/Makefile.am	Sat Mar  8 00:39:57 2008
@@ -17,8 +17,3 @@
 libtracker_common_la_LDFLAGS = -version-info 0:0:0
 libtracker_common_la_LIBADD = $(GLIB2_LIBS)
 
-noinst_HEADERS = 			\
-	tracker-configuration.h		\
-	tracker-config.h		\
-	tracker-language.h		\
-	tracker-log.h

Modified: trunk/src/tracker-applet/Makefile.am
==============================================================================
--- trunk/src/tracker-applet/Makefile.am	(original)
+++ trunk/src/tracker-applet/Makefile.am	Sat Mar  8 00:39:57 2008
@@ -18,10 +18,6 @@
 
 bin_PROGRAMS = tracker-applet
 
-noinst_HEADERS = \
-	tracker-applet.h \
-	tracker-applet-marshallers.h
-
 tracker_applet_LDADD = \
 	$(top_builddir)/src/libtracker/libtrackerclient.la \
 	$(LIBGLADE_LIBS) \
@@ -29,7 +25,9 @@
 
 tracker_applet_SOURCES = \
 	tracker-applet.c \
-	tracker-applet-marshallers.c
+	tracker-applet.h \
+	tracker-applet-marshallers.c \
+	tracker-applet-marshallers.h
 
 icon_DATA = \
 	tracker-applet-default.png \

Modified: trunk/src/tracker-preferences/Makefile.am
==============================================================================
--- trunk/src/tracker-preferences/Makefile.am	(original)
+++ trunk/src/tracker-preferences/Makefile.am	Sat Mar  8 00:39:57 2008
@@ -9,34 +9,32 @@
 
 pkgdata_DATA = tracker-preferences.glade
 
-noinst_HEADERS = tracker-preferences-dialogs.h \
-		 tracker-preferences.h \
-		 tracker-preferences-utils.h \
-		 $(NULL)
-
-INCLUDES =	-DTRACKER_DATADIR=\""$(datadir)/tracker"\" \
-		-DTRACKER_LOCALEDIR=\""$(localedir)"\" \
-		-DTRACKER_BINDIR=\""$(bindir)"\" \
-		$(GLIB_CFLAGS) \
-		$(GTK2_CFLAGS) \
-		$(LIBGLADE_CFLAGS) \
-		$(DBUS_CFLAGS) \
-		-I$(top_srcdir)/src/libtracker \
-		$(NULL)
-
-tracker_preferences_SOURCES = tracker-preferences.c \
-			      tracker-preferences-dialogs.c \
-			      tracker-preferences-main.c \
-			      tracker-preferences-utils.c \
-			      $(NULL)
-
-tracker_preferences_LDADD = $(GLIB_LIBS) \
-			    $(GTK2_LIBS) \
-			    $(LIBGLADE_LIBS) \
-			    $(DBUS_LIBS) \
-			    $(top_builddir)/src/libtracker-common/libtracker-common.la \
-			    $(top_builddir)/src/libtracker/libtrackerclient.la \
-			    $(NULL)
+INCLUDES = \
+	-DTRACKER_DATADIR=\""$(datadir)/tracker"\" \
+	-DTRACKER_LOCALEDIR=\""$(localedir)"\" \
+	-DTRACKER_BINDIR=\""$(bindir)"\" \
+	$(GLIB_CFLAGS) \
+	$(GTK2_CFLAGS) \
+	$(LIBGLADE_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	-I$(top_srcdir)/src/libtracker
+
+tracker_preferences_SOURCES = \
+	tracker-preferences.c \
+	tracker-preferences.h \
+	tracker-preferences-dialogs.c \
+	tracker-preferences-dialogs.h \
+	tracker-preferences-main.c \
+	tracker-preferences-utils.c \
+	tracker-preferences-utils.h
+
+tracker_preferences_LDADD = \
+	$(GLIB_LIBS) \
+	$(GTK2_LIBS) \
+	$(LIBGLADE_LIBS) \
+	$(DBUS_LIBS) \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(top_builddir)/src/libtracker/libtrackerclient.la
 
 EXTRA_DIST = $(pkgdata_DATA)