File gtk+-1.2.10-automake.patch of Package gtk1

--- docs/Makefile.am
+++ docs/Makefile.am
@@ -166,7 +166,7 @@
 	  echo $$p; \
 	done
 
-EXTRA_DIST += \
+EXTRA_DIST = \
 	Changes-1.2.txt			\
 	debugging.txt			\
 	developers.txt			\
--- gdk/Makefile.am
+++ gdk/Makefile.am
@@ -1,14 +1,13 @@
 ## Makefile.am for gtk+/gdk
 
-INCLUDES = @STRIP_BEGIN@ \
+INCLUDES = \
 	-DG_LOG_DOMAIN=\"Gdk\"	\
 	-I$(top_srcdir)		\
 	@GTK_DEBUG_FLAGS@ 	\
 	@GTK_XIM_FLAGS@		\
 	@GTK_LOCALE_FLAGS@	\
 	@GLIB_CFLAGS@		\
-	@x_cflags@ 		\
-@STRIP_END@
+	@x_cflags@
 
 #
 # libraries to compile and install
@@ -17,21 +16,20 @@
 
 # libtool stuff: set version and export symbols for resolving
 libgdkincludedir = $(includedir)/gtk-1.2/gdk
-libgdk_la_LDFLAGS = @STRIP_BEGIN@ \
+libgdk_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-release $(LT_RELEASE) \
 	-export-dynamic \
 	@GLIB_DEPLIBS@	\
 	@x_ldflags@	\
 	@x_libs@	\
-	-lm		\
-@STRIP_END@
+	-lm
 
 #
 # setup source file variables
 #
 # GDK header files for public installation (non-generated)
-gdk_public_h_sources = @STRIP_BEGIN@ \
+gdk_public_h_sources = \
 	gdk.h		\
 	gdkcursors.h	\
 	gdkrgb.h	\
@@ -39,9 +37,9 @@
 	gdkkeysyms.h	\
 	gdkprivate.h	\
 	gdktypes.h	\
-	gdkx.h		\
-@STRIP_END@
-gdk_c_sources = @STRIP_BEGIN@ \
+	gdkx.h
+
+gdk_c_sources = \
 	gdk.c		\
 	gdkcc.c		\
 	gdkcolor.c	\
@@ -72,17 +70,16 @@
 	MwmUtil.h       \
 	gxid_lib.h	\
 	gxid_proto.h	\
-        gxid_lib.c	\
-@STRIP_END@
+        gxid_lib.c
 
 #
 # setup GDK sources and their dependancies
 #
 libgdkinclude_HEADERS = $(gdk_public_h_sources)
 libgdk_la_SOURCES = $(gdk_c_sources)
-MAINTAINERCLEANFILES +=
-EXTRA_HEADERS +=
-EXTRA_DIST +=
+MAINTAINERCLEANFILES =
+EXTRA_HEADERS =
+EXTRA_DIST =
 EXTRA_DIST +=
 
 #
@@ -103,12 +100,12 @@
 #
 EXTRA_PROGRAMS = gxid
 bin_PROGRAMS = @xinput_progs@
-LDADDS = @STRIP_BEGIN@ \
+LDADDS = \
 	@x_ldflags@	\
 	@x_libs@	\
 	@GLIB_LIBS@	\
-	-lm		\
-@STRIP_END@
+	-lm
+
 gxid_SOURCES = gxid.c
 gxid_LDADD = $(LDADDS)
 
--- gtk/Makefile.am
+++ gtk/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for gtk+/gtk
 
-INCLUDES = @STRIP_BEGIN@ \
+INCLUDES = \
 	-DG_LOG_DOMAIN=\"Gtk\"				\
 	-DGTK_DISABLE_COMPAT_H				\
 	-DGTK_LIBDIR=\"$(libdir)\"	     	        \
@@ -12,8 +12,7 @@
 	@GTK_XIM_FLAGS@					\
 	@GTK_LOCALE_FLAGS@				\
 	@GLIB_CFLAGS@					\
-	@x_cflags@					\
-@STRIP_END@
+	@x_cflags@
 
 
 #
@@ -23,15 +22,15 @@
 
 # libtool stuff: set version and export symbols for resolving
 libgtkincludedir = $(includedir)/gtk-1.2/gtk
-libgtk_la_LDFLAGS = @STRIP_BEGIN@ \
+libgtk_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
 	-release $(LT_RELEASE) 					\
 	-export-dynamic						\
 	@GLIB_DEPLIBS@ 						\
 	@x_ldflags@						\
 	@x_libs@ 						\
-	-lm							\
-@STRIP_END@
+	-lm
+
 #	$(top_builddir)/gdk/libgdk.la
 
 
@@ -39,7 +38,7 @@
 # setup source file variables
 #
 # GTK+ header files for public installation (non-generated)
-gtk_public_h_sources = @STRIP_BEGIN@ \
+gtk_public_h_sources = \
 	gtk.h			\
 	gtkaccelgroup.h		\
 	gtkaccellabel.h		\
@@ -148,13 +147,13 @@
 	gtkvscrollbar.h		\
 	gtkvseparator.h		\
 	gtkwidget.h		\
-	gtkwindow.h		\
-@STRIP_END@
+	gtkwindow.h
+
 # GTK+ header files that don't get installed
-gtk_private_h_sources = @STRIP_BEGIN@ \
-@STRIP_END@
+gtk_private_h_sources =
+
 # GTK+ C sources to build the library from
-gtk_c_sources = @STRIP_BEGIN@ \
+gtk_c_sources = \
 	gtkaccelgroup.c		\
 	gtkaccellabel.c		\
 	gtkadjustment.c		\
@@ -262,8 +261,8 @@
 	gtkwidget.c		\
 	gtkwindow.c		\
 	fnmatch.c		\
-	fnmatch.h		\
-@STRIP_END@
+	fnmatch.h
+
 # we use our own built_sources variable rules to avoid automake's
 # BUILT_SOURCES oddities
 # we generate frequently rebuild files piggyback on a stamp file, so sources
@@ -271,7 +270,7 @@
 # content
 #
 # built sources that don't get installed
-gtk_built_sources = @STRIP_BEGIN@ \
+gtk_built_sources = \
 	stamp-gtk.defs		\
 	stamp-gtktypebuiltins.h	\
 	stamp-gtkmarshal.h	\
@@ -279,17 +278,17 @@
 	gtktypebuiltins_ids.c	\
 	gtktypebuiltins_evals.c	\
 	gtkmarshal.c		\
-	gtk.defs		\
-@STRIP_END@
+	gtk.defs
+
 # built sources that get installed with the header files
-gtk_built_public_sources = @STRIP_BEGIN@ \
+gtk_built_public_sources = \
 	gtkmarshal.h		\
-	gtktypebuiltins.h	\
-@STRIP_END@
+	gtktypebuiltins.h
+
 # non-header sources (headers should be specified in the above variables)
 # that don't serve as direct make target sources, i.e. they don't have
 # their own .lo rules and don't get publically installed
-gtk_extra_sources = @STRIP_BEGIN@ \
+gtk_extra_sources = \
 	gtkfeatures.h.in	\
 	makeenums.pl		\
 	makeenums.awk		\
@@ -298,22 +297,21 @@
 	gtkargcollector.c	\
 	gtk-boxed.defs		\
 	genmarshal.pl		\
-	gtkmarshal.list		\
-@STRIP_END@
+	gtkmarshal.list
+
 # Extra headers that are used for enum type array/id generation
-gdk_headers = @STRIP_BEGIN@ \
+gdk_headers = \
 	../gdk/gdktypes.h	\
-	../gdk/gdkrgb.h		\
-@STRIP_END@
+	../gdk/gdkrgb.h
 
 #
 # setup GTK+ sources and their dependancies
 #
 libgtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkfeatures.h
 libgtk_la_SOURCES = $(gtk_c_sources)
-MAINTAINERCLEANFILES += $(gtk_built_public_sources) $(gtk_built_sources)
-EXTRA_HEADERS +=
-EXTRA_DIST += $(gtk_private_h_sources)
+MAINTAINERCLEANFILES = $(gtk_built_public_sources) $(gtk_built_sources)
+EXTRA_HEADERS =
+EXTRA_DIST = $(gtk_private_h_sources)
 EXTRA_DIST += $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources)
 
 #
@@ -321,7 +319,7 @@
 #
 # setup autogeneration dependancies
 gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
-CLEANFILES += $(gen_sources)
+CLEANFILES = $(gen_sources)
 COPYING: $(gtk_built_public_sources) $(gtk_built_sources)
 $(OBJECTS): COPYING 	# this is our oldest-source-stamp
 # initial creation of the real stamp-* files
@@ -425,15 +423,15 @@
 #
 noinst_PROGRAMS = testgtk testinput testselection testrgb testdnd simple # testthreads
 DEPS = libgtk.la $(top_builddir)/gdk/libgdk.la
-LDADDS = @STRIP_BEGIN@ \
+LDADDS = \
 	libgtk.la			\
 	$(top_builddir)/gdk/libgdk.la	\
 	@x_ldflags@			\
 	@x_libs@			\
 	@GDK_WLIBS@			\
 	@GLIB_LIBS@			\
-	-lm				\
-@STRIP_END@
+	-lm
+
 testgtk_DEPENDENCIES = $(DEPS)
 testinput_DEPENDENCIES = $(DEPS)
 testselection_DEPENDENCIES = $(DEPS)
@@ -466,7 +464,7 @@
 	cd $$builddir; cd $(srcdir); \
 	$(SHELL) $$top_builddir/libtool --mode=execute gdb $$builddir/testgtk
 
-EXTRA_DIST += @STRIP_BEGIN@ \
+EXTRA_DIST += \
 	testgtk.1 		\
 	testgtkrc 		\
 	testgtkrc2 		\
@@ -487,5 +485,4 @@
 	check-y.xpm		\
 	check-n.xpm		\
 	test.xpm		\
-	$(gtkconf_DATA)		\
-@STRIP_END@
+	$(gtkconf_DATA)
openSUSE Build Service is sponsored by