GNOME.org
 

Patch for nautilus

Attached is a patch to nautilus to ensure that make clean deletes 
.server and .server.in files.

I would like to apply to both HEAD and gnome-2-0 branch.

Is it OK?

Padraig

cvs server: Diffing .
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.5499.2.5
diff -u -p -r1.5499.2.5 ChangeLog
--- ChangeLog	15 Sep 2002 17:35:59 -0000	1.5499.2.5
+++ ChangeLog	19 Sep 2002 16:33:01 -0000
@@ -1,3 +1,19 @@
+2002-09-19  Padraig O'Briain  <padraig obriain sun com>
+
+	* components/adapter/Makefile.am:
+	* components/hardware/Makefile.am:
+	* components/history/Makefile.am:
+	* components/loser/content/Makefile.am:
+	* components/loser/sidebar/Makefile.am:
+	* components/music/Makefile.am:
+	* components/notes/Makefile.am:
+	* components/sample/Makefile.am:
+	* components/text/Makefile.am:
+	* components/throbber/Makefile.am:
+	* components/tree/Makefile.am:
+	Add CLEANFILES so that make clean deletes $(server_DATA) and 
+	$(server_DATA).in
+
 2002-09-15  Dave Camp  <dave ximian com>
 
         Fixes bug #89616. 
cvs server: Diffing components
cvs server: Diffing components/adapter
Index: components/adapter/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/adapter/Makefile.am,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile.am
--- components/adapter/Makefile.am	17 Jul 2002 17:18:47 -0000	1.24
+++ components/adapter/Makefile.am	19 Sep 2002 16:33:01 -0000
@@ -50,3 +50,5 @@ nautilus_adapter_LDADD =				\
 	$(NULL)
 
 EXTRA_DIST = $(server_in_files).in
+
+CLEANFILES = $(server_in_files) $(server_DATA)
cvs server: Diffing components/hardware
Index: components/hardware/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/hardware/Makefile.am,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile.am
--- components/hardware/Makefile.am	17 Jul 2002 16:04:05 -0000	1.24
+++ components/hardware/Makefile.am	19 Sep 2002 16:33:01 -0000
@@ -35,3 +35,6 @@ nautilus_hardware_view_LDADD =				\
 
 EXTRA_DIST = $(server_in_files) $(nautilus_hardware_view_SOURCES)
 
+if ENABLE_HARDWARE_VIEW
+CLEANFILES = $(server_DATA) $(server_DATA).in
+endif
cvs server: Diffing components/hardware/icons
cvs server: Diffing components/history
Index: components/history/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/history/Makefile.am,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile.am
--- components/history/Makefile.am	16 Jul 2002 22:17:32 -0000	1.29
+++ components/history/Makefile.am	19 Sep 2002 16:33:01 -0000
@@ -32,3 +32,4 @@ $(server_in_files:.server.in.in=.server.
 @INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST=$(server_in_files)
+CLEANFILES = $(server_DATA) $(server_DATA).in
cvs server: Diffing components/loser
cvs server: Diffing components/loser/content
Index: components/loser/content/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/loser/content/Makefile.am,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile.am
--- components/loser/content/Makefile.am	16 Jul 2002 22:17:34 -0000	1.27
+++ components/loser/content/Makefile.am	19 Sep 2002 16:33:01 -0000
@@ -32,3 +32,4 @@ $(server_in_files:.server.in.in=.server.
 @INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST=$(server_in_files) $(ui_DATA)
+CLEANFILES = $(server_DATA) $(server_DATA).in
cvs server: Diffing components/loser/sidebar
Index: components/loser/sidebar/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/loser/sidebar/Makefile.am,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile.am
--- components/loser/sidebar/Makefile.am	16 Jul 2002 22:17:37 -0000	1.27
+++ components/loser/sidebar/Makefile.am	19 Sep 2002 16:33:01 -0000
@@ -32,3 +32,4 @@ $(server_in_files:.server.in.in=.server.
 @INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST=$(server_in_files) $(ui_DATA)
+CLEANFILES = $(server_DATA) $(server_DATA).in
cvs server: Diffing components/music
Index: components/music/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/music/Makefile.am,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile.am
--- components/music/Makefile.am	16 Jul 2002 22:17:39 -0000	1.40
+++ components/music/Makefile.am	19 Sep 2002 16:33:01 -0000
@@ -72,3 +72,4 @@ EXTRA_DIST=$(server_in_files) $(platform
 	fileinfo.c				\
 	getbits.c				\
 	$(NULL)
+CLEANFILES = $(server_DATA) $(server_DATA).in
cvs server: Diffing components/news
cvs server: Diffing components/notes
Index: components/notes/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/notes/Makefile.am,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile.am
--- components/notes/Makefile.am	16 Jul 2002 22:17:40 -0000	1.29
+++ components/notes/Makefile.am	19 Sep 2002 16:33:01 -0000
@@ -30,3 +30,4 @@ $(server_in_files:.server.in.in=.server.
 @INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST= $(server_in_files)
+CLEANFILES = $(server_DATA) $(server_DATA).in
cvs server: Diffing components/sample
Index: components/sample/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/sample/Makefile.am,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile.am
--- components/sample/Makefile.am	16 Jul 2002 22:17:41 -0000	1.35
+++ components/sample/Makefile.am	19 Sep 2002 16:33:01 -0000
@@ -36,3 +36,4 @@ $(server_in_files:.server.in.in=.server.
 @INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST = $(server_in_files) $(ui_DATA) 
+CLEANFILES = $(server_DATA) $(server_DATA).in
cvs server: Diffing components/text
Index: components/text/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/text/Makefile.am,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile.am
--- components/text/Makefile.am	16 Jul 2002 22:17:43 -0000	1.20
+++ components/text/Makefile.am	19 Sep 2002 16:33:01 -0000
@@ -34,3 +34,4 @@ $(server_in_files:.server.in.in=.server.
 @INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST = $(server_in_files) $(nautilus_text_view_SOURCES)
+CLEANFILES = $(server_DATA) $(server_DATA).in
cvs server: Diffing components/text/services
cvs server: Diffing components/throbber
Index: components/throbber/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/throbber/Makefile.am,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile.am
--- components/throbber/Makefile.am	16 Jul 2002 22:17:45 -0000	1.15
+++ components/throbber/Makefile.am	19 Sep 2002 16:33:01 -0000
@@ -31,3 +31,4 @@ $(server_in_files:.server.in.in=.server.
 @INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST = $(server_in_files)
+CLEANFILES = $(server_DATA) $(server_DATA).in
cvs server: Diffing components/tree
Index: components/tree/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/tree/Makefile.am,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile.am
--- components/tree/Makefile.am	16 Jul 2002 22:17:47 -0000	1.29
+++ components/tree/Makefile.am	19 Sep 2002 16:33:01 -0000
@@ -38,3 +38,4 @@ $(server_in_files:.server.in.in=.server.
 @INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST = $(server_in_files)
+CLEANFILES = $(server_DATA) $(server_DATA).in
cvs server: Diffing cut-n-paste-code
cvs server: Diffing cut-n-paste-code/widgets
cvs server: Diffing cut-n-paste-code/widgets/gimphwrapbox
cvs server: Diffing data
cvs server: Diffing data/emblems
cvs server: Diffing data/patterns
cvs server: Diffing docs
cvs server: Diffing help
cvs server: Diffing help/nautilus-quick-reference
cvs server: Diffing help/nautilus-quick-reference/C
cvs server: Diffing help/nautilus-quick-reference/C/figures
cvs server: Diffing help/nautilus-quick-reference/C/figures/xcf
cvs server: Diffing help/nautilus-quick-reference/es
cvs server: Diffing help/nautilus-quick-reference/es/figures
cvs server: Diffing help/nautilus-quick-reference/ko
cvs server: Diffing help/nautilus-quick-reference/ko/figures
cvs server: Diffing help/nautilus-quick-reference/no
cvs server: Diffing help/nautilus-quick-reference/no/figures
cvs server: Diffing help/nautilus-quick-reference/sv
cvs server: Diffing help/nautilus-quick-reference/sv/figures
cvs server: Diffing help/nautilus-release-notes
cvs server: Diffing help/nautilus-release-notes/C
cvs server: Diffing help/nautilus-screenshot-guidelines
cvs server: Diffing help/nautilus-screenshot-guidelines/C
cvs server: Diffing help/nautilus-screenshot-guidelines/C/figures
cvs server: Diffing help/nautilus-user-manual
cvs server: Diffing help/nautilus-user-manual/C
cvs server: Diffing help/nautilus-user-manual/C/figures
cvs server: Diffing help/nautilus-user-manual/C/figures/xcf
cvs server: Diffing help/nautilus-user-manual/es
cvs server: Diffing help/nautilus-user-manual/es/figures
cvs server: Diffing help/nautilus-user-manual/ko
cvs server: Diffing help/nautilus-user-manual/ko/figures
cvs server: Diffing icons
cvs server: Diffing icons/crux_eggplant
cvs server: Diffing icons/crux_eggplant/backgrounds
cvs server: Diffing icons/crux_eggplant/sidebar_tab_pieces
cvs server: Diffing icons/crux_eggplant/throbber
cvs server: Diffing icons/crux_teal
cvs server: Diffing icons/crux_teal/backgrounds
cvs server: Diffing icons/crux_teal/sidebar_tab_pieces
cvs server: Diffing icons/crux_teal/throbber
cvs server: Diffing icons/default
cvs server: Diffing icons/gnome
cvs server: Diffing icons/gnome/sidebar_tab_pieces
cvs server: Diffing icons/gnome/throbber
cvs server: Diffing icons/sidebar_tab_pieces
cvs server: Diffing icons/sierra
cvs server: Diffing icons/tahoe
cvs server: Diffing icons/throbber
cvs server: Diffing libbackground
cvs server: Diffing libnautilus
cvs server: Diffing libnautilus-adapter
cvs server: Diffing libnautilus-private
cvs server: Diffing omf-install
cvs server: Diffing po
cvs server: Diffing src
cvs server: Diffing src/file-manager
cvs server: Diffing test
cvs server: Diffing user-guide
cvs server: Diffing user-guide/C
cvs server: Diffing user-guide/gnufdl
cvs server: Diffing user-guide/gnugpl
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]