SOURCES (AC-branch): metacity-libtool.patch - merged from HEAD

[baggins]

Author: baggins                      Date: Mon May 15 14:49:26 2006 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SOURCES:
   metacity-libtool.patch (1.2 -> 1.2.10.1) 

---- Diffs:

================================================================
Index: SOURCES/metacity-libtool.patch
diff -u SOURCES/metacity-libtool.patch:1.2 SOURCES/metacity-libtool.patch:1.2.10.1
--- SOURCES/metacity-libtool.patch:1.2	Mon Dec  9 22:28:15 2002
+++ SOURCES/metacity-libtool.patch	Mon May 15 16:49:21 2006
@@ -1,7 +1,7 @@
-diff -urN metacity-2.4.8.orig/src/Makefile.am metacity-2.4.8/src/Makefile.am
---- metacity-2.4.8.orig/src/Makefile.am	Mon Dec  9 21:58:58 2002
-+++ metacity-2.4.8/src/Makefile.am	Mon Dec  9 22:03:04 2002
-@@ -31,8 +31,6 @@
+diff -aurN metacity-2.13.3.orig/src/Makefile.am metacity-2.13.3/src/Makefile.am
+--- metacity-2.13.3.orig/src/Makefile.am	2005-11-21 17:04:57.000000000 +0100
++++ metacity-2.13.3/src/Makefile.am	2005-11-24 15:11:29.000000000 +0100
+@@ -41,8 +41,6 @@
  	frame.h					\
  	frames.c				\
  	frames.h				\
@@ -10,7 +10,7 @@
  	group.c					\
  	group.h					\
  	group-private.h				\
-@@ -64,16 +62,10 @@
+@@ -74,16 +72,10 @@
  	stack.h					\
  	tabpopup.c				\
  	tabpopup.h				\
@@ -27,7 +27,7 @@
  	window.c				\
  	window.h				\
  	window-props.c				\
-@@ -117,17 +109,17 @@
+@@ -133,18 +125,18 @@
  libexec_PROGRAMS=metacity-dialog
  
  EFENCE=
@@ -36,16 +36,17 @@
  metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la
  metacity_dialog_LDADD=@METACITY_LIBS@
  
+ testboxes_SOURCES=util.h util.c boxes.h boxes.c testboxes.c
 -testgradient_SOURCES=gradient.h gradient.c testgradient.c
 +testgradient_SOURCES=testgradient.c
  testasyncgetprop_SOURCES=async-getprop.h async-getprop.c testasyncgetprop.c
  
- noinst_PROGRAMS=testgradient testasyncgetprop
+ noinst_PROGRAMS=testboxes testgradient testasyncgetprop
  
+-testboxes_LDADD= @METACITY_LIBS@
 -testgradient_LDADD= @METACITY_LIBS@
--testasyncgetprop_LDADD= @METACITY_LIBS@
++testboxes_LDADD= @METACITY_LIBS@ 
 +testgradient_LDADD= @METACITY_LIBS@ libmetacity-private.la
-+testasyncgetprop_LDADD= @METACITY_LIBS@ 
+ testasyncgetprop_LDADD= @METACITY_LIBS@
  
  desktopfilesdir=$(datadir)/gnome/wm-properties
- desktopfiles_in_files=metacity.desktop.in
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/metacity-libtool.patch?r1=1.2&r2=1.2.10.1&f=u