[libgsf] compilation: distcheck fixes.

[Morten Welinder <mortenw src gnome org>]

commit 680aebe63f74e70c959fd91df836f319d8c117cf
Author: Morten Welinder <terra gnome org>
Date:   Thu Apr 19 21:42:20 2012 -0400

    compilation: distcheck fixes.
    
    Get CLEANFILES definition under control.
    
    Install introspection files into $prefix even if that isn't where gir
    wants them.

 configure.in          |    6 ------
 gsf-win32/Makefile.am |    2 +-
 gsf.mk                |    3 ++-
 gsf/Makefile.am       |   19 +++++++++----------
 4 files changed, 12 insertions(+), 18 deletions(-)
---
diff --git a/configure.in b/configure.in
index 504b83b..8932d34 100644
--- a/configure.in
+++ b/configure.in
@@ -71,20 +71,14 @@ AM_CONDITIONAL(HAVE_INTROSPECTION, $have_introspection)
 G_IR_SCANNER=
 G_IR_COMPILER=
 G_IR_GENERATE=
-GIRDIR=
-TYPELIBDIR=
 if $have_introspection; then
    G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
    G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
    G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-   GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-   TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
 fi
 AC_SUBST(G_IR_SCANNER)
 AC_SUBST(G_IR_COMPILER)
 AC_SUBST(G_IR_GENERATE)
-AC_SUBST(GIRDIR)
-AC_SUBST(TYPELIBDIR)
 
 
 dnl Checks for libraries.
diff --git a/gsf-win32/Makefile.am b/gsf-win32/Makefile.am
index 3b26f1a..4f48f15 100644
--- a/gsf-win32/Makefile.am
+++ b/gsf-win32/Makefile.am
@@ -32,6 +32,6 @@ gsf_win32_mslib_DATA = gsf-win32-1.lib
 gsf-win32-1.lib: libgsf-win32-1.la lib.def
 	lib -name:libgsf-win32-1-$(CURRENT_MINUS_AGE).dll -def:lib.def -out:$@
 
-CLEANFILES = gsf-win32-1.exp gsf-win32-1.lib
+CLEANFILES += gsf-win32-1.exp gsf-win32-1.lib
 endif
 
diff --git a/gsf.mk b/gsf.mk
index 8956efa..2ee2a7a 100644
--- a/gsf.mk
+++ b/gsf.mk
@@ -1,3 +1,4 @@
+CLEANFILES=
 if WITH_WIN32
 
 noinst_DATA = lib.def
@@ -26,6 +27,6 @@ stamp-lib.def: $(LIB_PUBLIC_HDRS) Makefile $(top_srcdir)/dumpdef.pl
 	&& rm -f xgen-libdef.1 xgen-libdef.2 \
 	&& echo timestamp > $@	
 
-CLEANFILES = lib.def stamp-lib.def
+CLEANFILES += lib.def stamp-lib.def
 
 endif
diff --git a/gsf/Makefile.am b/gsf/Makefile.am
index 87980a6..18499d6 100644
--- a/gsf/Makefile.am
+++ b/gsf/Makefile.am
@@ -1,9 +1,10 @@
 AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) \
 	$(Z_CPPFLAGS) $(LIBGSF_GIO_CFLAGS) \
 	-DGSFLOCALEDIR=\"$(datadir)/locale\"
-
 lib_LTLIBRARIES = libgsf-1.la
 
+include $(top_srcdir)/gsf.mk
+
 if WITH_GIO
 gioc=gsf-input-gio.c gsf-output-gio.c
 gioh=gsf-input-gio.h gsf-output-gio.h
@@ -135,10 +136,10 @@ libgsf_1_include_HEADERS = 	\
 #	gsf-command-context.h	\
 #	gsf-io-context.h
 
-include $(top_srcdir)/gsf.mk
 CPP_CFLAGS = -DGLIB_CHECK_VERSION\(x,y,z\)
 LIB_PUBLIC_HDRS = $(libgsf_1_include_HEADERS)
 
+
 if HAVE_LIBEXE
 gsf_mslibdir = $(DESTDIR)$(libdir)
 gsf_mslib_DATA = gsf-1.lib
@@ -146,7 +147,7 @@ gsf_mslib_DATA = gsf-1.lib
 gsf-1.lib: libgsf-1.la lib.def
 	lib -name:libgsf-1-$(CURRENT_MINUS_AGE).dll -def:lib.def -out:$@
 
-CLEANFILES = gsf-1.exp gsf-1.lib
+CLEANFILES += gsf-1.exp gsf-1.lib
 endif
 
 BUILT_GIRSOURCES = Gsf-1.gir
@@ -156,10 +157,6 @@ Gsf-1.gir: $(NOINST_H_FILES)
 Gsf-1.gir: $(libgsf_1_la_SOURCES)
 Gsf-1.gir: libgsf-1.la
 Gsf-1.gir: $(G_IR_SCANNER) Makefile
-	(TMP= ; \
-	for i in $(libgsf_1_include_HEADERS) $(libgsf_1_la_SOURCES); do \
-	  TMP="$$TMP $(srcdir)/$$i" ; \
-	done ;\
 	$(AM_V_GEN) $(G_IR_SCANNER) -v --namespace Gsf --nsversion=1 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
 	    --include=GObject-2.0 \
@@ -169,16 +166,18 @@ Gsf-1.gir: $(G_IR_SCANNER) Makefile
 	    --libtool="$(LIBTOOL)" \
 	    --output $@ \
 	    -I$(top_srcdir) \
-	    $$TMP)
+	    `for i in $(libgsf_1_include_HEADERS) $(libgsf_1_la_SOURCES); do echo "$(srcdir)/$$i"; done`
 
 if HAVE_INTROSPECTION
 
-girdir = $(GIRDIR)
+girdir = $(datadir)/gir-1.0
 gir_DATA = $(BUILT_GIRSOURCES)
 
-typelibsdir = $(TYPELIBDIR)
+typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
+CLEANFILES += $(gir_DATA) $(typelibs_DATA)
+
 %.typelib: %.gir $(G_IR_COMPILER)
 	$(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $(builddir)/$(@F)