glib2: don't install anything from the bundled library

All we want is the libglib.la convenience library. The -version-info is
removed since it causes warnings.

4 files changed, 9 insertions, 57 deletions

diff --git a/glib2/Makefile.am b/glib2/Makefile.am
index 9361594..4f48377 100644
--- a/glib2/Makefile.am
+++ b/glib2/Makefile.am
@@ -55,7 +55,7 @@ BUILT_EXTRA_DIST = 		\
 	config.h.win32
 
 configexecincludedir = $(libdir)/glib-2.0/include
-configexecinclude_DATA = glibconfig.h
+noinst_DATA = glibconfig.h
 
 uninstall-local:
 	rm -f $(DESTDIR)$(configexecincludedir)/glibconfig.h
@@ -85,7 +85,7 @@ ChangeLog:
 	fi
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = glib-2.0.pc
+noinst_DATA += glib-2.0.pc
 
 $(pkgconfig_DATA): config.status
 
diff --git a/glib2/glib/Makefile.am b/glib2/glib/Makefile.am
index 340705e..e62e4a9 100644
--- a/glib2/glib/Makefile.am
+++ b/glib2/glib/Makefile.am
@@ -85,7 +85,7 @@ BUILT_EXTRA_DIST = 		\
 	galias.h		\
 	galiasdef.c
 
-lib_LTLIBRARIES = libglib-2.0.la
+noinst_LTLIBRARIES = libglib-2.0.la
 
 if OS_WIN32_AND_DLL_COMPILATION
 if MS_LIB_AVAILABLE
@@ -197,12 +197,12 @@ EXTRA_libglib_2_0_la_SOURCES = \
 	gwin32.c
 
 glibincludedir=$(includedir)/glib-2.0
-glibinclude_HEADERS =   \
+noinst_HEADERS =   \
 	glib-object.h	\
 	glib.h
 
 glibsubincludedir=$(includedir)/glib-2.0/glib
-glibsubinclude_HEADERS =   \
+noinst_HEADERS +=   \
 	galloca.h	\
 	garray.h	\
 	gasyncqueue.h	\
@@ -319,7 +319,6 @@ libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAW
 
 libglib_2_0_la_LDFLAGS = \
 	 $(glib_win32_res_ldflag) \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-export-dynamic $(no_undefined) $(export_symbols)
 
 INSTALL_PROGS=
@@ -352,7 +351,7 @@ endif
 glib-win32-res.o: glib.rc
 	$(WINDRES) glib.rc $@
 
-bin_PROGRAMS	 = ${INSTALL_PROGS}
+noinst_PROGRAMS	 = ${INSTALL_PROGS}
 
 if OS_UNIX
 
@@ -361,23 +360,13 @@ gtester_SOURCES	 = gtester.c
 gtester_LDADD	 = libglib-2.0.la 
 
 auto_config_binscripts = gtester-report
-bin_SCRIPTS = ${auto_config_binscripts}
+noinst_SCRIPTS = ${auto_config_binscripts}
 EXTRA_DIST += ${auto_config_binscripts}
 
 CONFIGVARS = \
         "bindir"    	: "${bindir}",		\
         "glib-version"  : "${GLIB_VERSION}"
 
-install-exec-hook:
-	for sf in ${auto_config_binscripts} ; do \
-	  mv -f "$(DESTDIR)$(bindir)/$$sf" "$(DESTDIR)$(bindir)/$$sf".tmp \
-	  && sed < "$(DESTDIR)$(bindir)/$$sf".tmp > "$(DESTDIR)$(bindir)/$$sf" \
-	    -e '1,24s|^ *#@PKGINSTALL_CONFIGVARS_IN24LINES@|  ${CONFIGVARS}|' \
-	    -e '1,1s|#! /usr/bin/env python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|' \
-	  || exit $$? ; \
-	  rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \
-	done
-
 endif
 
 glib-2.0.lib: libglib-2.0.la glib.def
@@ -407,19 +396,7 @@ distclean-local:
 
 # install gdb scripts
 gdbdir = $(datadir)/glib-2.0/gdb
-dist_gdb_SCRIPTS = glib.py
+dist_noinst_SCRIPTS = glib.py
 
 libglib-gdb.py: libglib-gdb.py.in
 	sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
-
-
-install-data-hook: libglib-gdb.py
-	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
-	$(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
-if HAVE_GLIB_RUNTIME_LIBDIR
-	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
-	mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
-	mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
-	rm -f $(DESTDIR)$(libdir)/libglib-2.0.so
-	ln -s $(GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/libglib-2.0.so
-endif
diff --git a/glib2/glib/libcharset/Makefile.am b/glib2/glib/libcharset/Makefile.am
index cfa3412..a173d81 100644
--- a/glib2/glib/libcharset/Makefile.am
+++ b/glib2/glib/libcharset/Makefile.am
@@ -24,31 +24,6 @@ EXTRA_DIST += 			\
 
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
-install-exec-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	if test -f $(charset_alias); then \
-	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
-	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-	  rm -f $(charset_tmp) ; \
-	else \
-	  if test @GLIBC21@ = no; then \
-	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-	    rm -f $(charset_tmp) ; \
-	  fi ; \
-	fi
-
-uninstall-local: all-local
-	if test -f $(charset_alias); then \
-	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
-	  if grep '^# Packages using this file: $$' $(charset_tmp) \
-	      > /dev/null; then \
-	    rm -f $(charset_alias); \
-	  else \
-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
-	  fi; \
-	  rm -f $(charset_tmp); \
-	fi
 
 charset.alias: config.charset
 	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
diff --git a/glib2/m4macros/Makefile.am b/glib2/m4macros/Makefile.am
index 0284b4e..ea54548 100644
--- a/glib2/m4macros/Makefile.am
+++ b/glib2/m4macros/Makefile.am
@@ -5,4 +5,4 @@ installed_m4= glib-2.0.m4 glib-gettext.m4
 EXTRA_DIST+=$(installed_m4)
 
 m4datadir = $(datadir)/aclocal
-m4data_DATA = $(installed_m4)
+noinst_DATA = $(installed_m4)