Re: [PATCH] 2 glib patches for auto*/Makefile

[Owen Taylor <otaylor redhat com>]

Daniel Egger <degger fhm edu> writes:

> Am Mon, 2002-03-25 um 16.30 schrieb Owen Taylor:
> 
> >  I do plan on upgrading the combination we support for 2.2; if you
> >  want to put your patches in bugzilla, they'll presumably be a 
> >  big help when we do that.
> 
> Done. What about the makefile issue in the other patch?

These seem to be automake-1.5 compatiblity changes, so I'd put them 
in the same category. (And while I'd certainly like to get rid of
@STRIP_BEGIN@, @STRIP_END@, that would have to be approved by Tim
and done in GTK+ as well.)

Regards,
                                        Owen 

> -- 
> Servus,
>        Daniel
> --- ../../glib-test/gobject/Makefile.am	Sat Mar 23 12:12:41 2002
> +++ Makefile.am	Sat Mar 23 12:29:47 2002
> @@ -62,7 +62,7 @@
>  # setup source file variables
>  #
>  # GObject library header files for public installation (non-generated)
> -gobject_public_h_sources = @STRIP_BEGIN@ \
> +gobject_public_h_sources =	\
>  	gboxed.h		\
>  	gclosure.h		\
>  	genums.h		\
> @@ -78,13 +78,13 @@
>  	gvaluearray.h		\
>  	gvaluecollector.h	\
>  	gvaluetypes.h		\
> -	gobjectnotifyqueue.c	\
> - STRIP_END@
> +	gobjectnotifyqueue.c
> +
>  # GObject library header files that don't get installed
>  gobject_private_h_sources = @STRIP_BEGIN@ \
>  @STRIP_END@
>  # GObject library C sources to build the library from
> -gobject_c_sources = @STRIP_BEGIN@ \
> +gobject_c_sources =		\
>  	gboxed.c		\
>  	gclosure.c		\
>  	genums.c		\
> @@ -99,8 +99,7 @@
>  	gvalue.c		\
>  	gvaluearray.c		\
>  	gvaluetransform.c	\
> -	gvaluetypes.c		\
> - STRIP_END@
> +	gvaluetypes.c
>  
>  # we use our own built_sources variable rules to avoid automake's
>  # BUILT_SOURCES oddities
> @@ -132,9 +131,9 @@
>  #
>  gobject_target_headers = $(gobject_public_h_sources) $(gobject_built_public_sources)
>  gobject_target_sources = $(gobject_c_sources)
> -MAINTAINERCLEANFILES += $(gobject_built_sources)
> -EXTRA_HEADERS +=
> -EXTRA_DIST += $(gobject_private_h_sources) $(gobject_extra_sources)
> +MAINTAINERCLEANFILES = $(gobject_built_sources)
> +EXTRA_HEADERS =
> +EXTRA_DIST = $(gobject_private_h_sources) $(gobject_extra_sources)
>  EXTRA_DIST += $(gobject_built_sources)
>  
>  #
> @@ -142,7 +141,7 @@
>  #
>  # setup autogeneration dependancies
>  gen_sources = xgen-gmh xgen-gmc xgen-gms
> -CLEANFILES += $(gen_sources)
> +CLEANFILES = $(gen_sources)
>  
>  $(libgobject_2_0_la_OBJECTS): $(gobject_built_sources)  ${gobject_built_public_sources} # this is our oldest file, used for implicit auto-generation deps
>  # initial creation of the real stamp-* files