ensonic common: common/

CVS Root:       /cvs/gstreamer
Module:         common
Changes by:     ensonic
Date:           Mon Dec 01 2008  09:00:30 UTC

Log message:
	* gtk-doc-plugins.mak:
	* gtk-doc.mak:
	  Simplily uninstall rule. Its closer to upstream and fixes #150331.

Modified files:
    .               : ChangeLog gtk-doc-plugins.mak gtk-doc.mak

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/ChangeLog.diff?r1=1.258&r2=1.259
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/gtk-doc-plugins.mak.diff?r1=1.47&r2=1.48
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/gtk-doc.mak.diff?r1=1.28&r2=1.29

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/common/ChangeLog,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -d -r1.258 -r1.259
--- ChangeLog	29 Nov 2008 19:40:02 -0000	1.258
+++ ChangeLog	1 Dec 2008 09:00:15 -0000	1.259
@@ -1,3 +1,9 @@
+2008-12-01  Stefan Kost  <[email protected]>
+
+	* gtk-doc-plugins.mak:
+	* gtk-doc.mak:
+	  Simplily uninstall rule. Its closer to upstream and fixes #150331.
 2008-11-29  Sebastian Dröge  <[email protected]>
 
 	* m4/glib-gettext.m4:
Index: gtk-doc-plugins.mak
RCS file: /cvs/gstreamer/common/gtk-doc-plugins.mak,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- gtk-doc-plugins.mak	6 Sep 2008 01:10:27 -0000	1.47
+++ gtk-doc-plugins.mak	1 Dec 2008 09:00:15 -0000	1.48
@@ -302,36 +302,12 @@
 	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || true ; \
 	fi) 
 uninstall-local:
-	(installfiles=`echo ./html/*.html`; \
-	if test "$$installfiles" = './html/*.html'; \
-	then echo '-- Nothing to uninstall' ; \
+	if test -d $(DESTDIR)$(TARGET_DIR); then \
+	  rm -rf $(DESTDIR)$(TARGET_DIR)/*; \
+	  rmdir -p $(DESTDIR)$(TARGET_DIR) 2>/dev/null || true; \
 	else \
-	  for i in $$installfiles; do \
-	    rmfile=`basename $$i` ; \
-	    echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
-	    rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
-	  done; \
-	  pngfiles=`echo ./html/*.png`; \
-	  if test "$$pngfiles" != './html/*.png'; then \
-	    for i in $$pngfiles; do \
-	      rmfile=`basename $$i` ; \
-	      echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
-	      rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
-	    done; \
-	  fi; \
-	  echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE).devhelp' ; \
-	  rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@[email protected]; \
-	  if test -e $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@[email protected]; then \
-	    rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@[email protected]; \
-	  echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/index.sgml' ; \
-	  rm -f $(DESTDIR)$(TARGET_DIR)/index.sgml; \
-		if test -e $(DESTDIR)$(TARGET_DIR)/style.css; then \
-			echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/style.css' ; \
-			rm -f $(DESTDIR)$(TARGET_DIR)/style.css; \
-		fi; \
-	fi) 
-	if test -d $(DESTDIR)$(TARGET_DIR); then rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(TARGET_DIR) 2>/dev/null; fi; true
+	  echo '-- Nothing to uninstall' ; \
+	fi;
 #
 # Checks
Index: gtk-doc.mak
RCS file: /cvs/gstreamer/common/gtk-doc.mak,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- gtk-doc.mak	30 Oct 2008 14:35:59 -0000	1.28
+++ gtk-doc.mak	1 Dec 2008 09:00:15 -0000	1.29
@@ -206,36 +206,13 @@
 # Require gtk-doc when making dist

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/

_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose