glib: Keep a few more programs from being installed or generated

4 files changed, 42 insertions, 59 deletions

diff --git a/glib-patches/no-installed-files.patch b/glib-patches/no-installed-files.patch
index e5ba715..0014b6a 100644
--- a/glib-patches/no-installed-files.patch
+++ b/glib-patches/no-installed-files.patch
@@ -1,5 +1,5 @@
 diff --git a/glib/glib/Makefile.am b/glib/glib/Makefile.am
-index 6fb3a34..e0ace06 100644
+index 6fb3a34..ecb3dff 100644
 --- a/glib/glib/Makefile.am
 +++ b/glib/glib/Makefile.am
 @@ -16,7 +16,7 @@ CLEANFILES =
@@ -61,29 +61,49 @@ index 6fb3a34..e0ace06 100644
  if PLATFORM_WIN32
  no_undefined = -no-undefined
  endif
-@@ -371,7 +362,6 @@ libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAW
+@@ -371,11 +362,8 @@ libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAW
  
  libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
  	 $(glib_win32_res_ldflag) \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
  	-export-dynamic $(no_undefined) $(export_symbols)
  
- INSTALL_PROGS=
-@@ -405,7 +395,7 @@ endif
+-INSTALL_PROGS=
+-
+ gspawn-win32-helper-console.c:
+ 	echo '#define HELPER_CONSOLE' >$@
+ 	echo '#include "gspawn-win32-helper.c"' >>$@
+@@ -388,50 +376,17 @@ gspawn-win64-helper-console.c:
+ 	echo '#include "gspawn-win32-helper.c"' >>$@
+ 
+ 
+-if OS_WIN32
+-if OS_WIN32_X64
+-INSTALL_PROGS += gspawn-win64-helper gspawn-win64-helper-console
+-gspawn_win64_helper_LDADD = libglib-2.0.la
+-gspawn_win64_helper_LDFLAGS = -mwindows
+-gspawn_win64_helper_console_LDADD = libglib-2.0.la
+-else
+-INSTALL_PROGS += gspawn-win32-helper gspawn-win32-helper-console
+-gspawn_win32_helper_LDADD = libglib-2.0.la
+-gspawn_win32_helper_LDFLAGS = -mwindows
+-gspawn_win32_helper_console_LDADD = libglib-2.0.la
+-endif
+-endif
+-
  glib-win32-res.o: glib.rc
  	$(WINDRES) glib.rc $@
  
 -bin_PROGRAMS	 = ${INSTALL_PROGS}
-+noinst_PROGRAMS	 = ${INSTALL_PROGS}
- 
+-
  if OS_UNIX
  
-@@ -414,24 +404,12 @@ gtester_SOURCES	 = gtester.c
- gtester_LDADD	 = libglib-2.0.la 
- 
+-INSTALL_PROGS	+= gtester
+-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 = \
@@ -104,15 +124,17 @@ index 6fb3a34..e0ace06 100644
  endif
  
  glib-2.0.lib: libglib-2.0.la glib.def
-@@ -481,22 +459,7 @@ dist-hook: $(BUILT_EXTRA_DIST)
- 
- # install gdb scripts
- gdbdir = $(datadir)/glib-2.0/gdb
+@@ -478,25 +433,3 @@ dist-hook: $(BUILT_EXTRA_DIST)
+ 	done >libglib.vs10.sourcefiles.filters
+ 	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib.vcxproj.filtersin >$@	
+ 	rm libglib.vs10.sourcefiles.filters
+-
+-# 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
- 	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
+-
+-libglib-gdb.py: libglib-gdb.py.in
+-	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
 -
 -
 -install-data-hook: libglib-gdb.py
diff --git a/glib-patches/update-glib.sh b/glib-patches/update-glib.sh
index 62608e4..d33b801 100755
--- a/glib-patches/update-glib.sh
+++ b/glib-patches/update-glib.sh
@@ -92,7 +92,8 @@ rm -f \
     glib/glib/glib_probes.d \
     glib/glib/glibconfig.h.win32.in \
     glib/msvc_recommended_pragmas.h \
-    glib/win32-fixup.pl
+    glib/win32-fixup.pl \
+    glib/glib/libglib-gdb.py.in
 find glib -name 'makefile.msc*' | xargs rm -f
 find glib -name 'ChangeLog*' | xargs rm -f
 find glib -name '*.pc.in' | xargs rm -f
diff --git a/glib/glib/Makefile.am b/glib/glib/Makefile.am
index 005b9b2..8c7fbeb 100644
--- a/glib/glib/Makefile.am
+++ b/glib/glib/Makefile.am
@@ -345,8 +345,6 @@ libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
 	 $(glib_win32_res_ldflag) \
 	-export-dynamic $(no_undefined) $(export_symbols)
 
-INSTALL_PROGS=
-
 gspawn-win32-helper-console.c:
 	echo '#define HELPER_CONSOLE' >$@
 	echo '#include "gspawn-win32-helper.c"' >>$@
@@ -359,33 +357,12 @@ gspawn-win64-helper-console.c:
 	echo '#include "gspawn-win32-helper.c"' >>$@
 
 
-if OS_WIN32
-if OS_WIN32_X64
-INSTALL_PROGS += gspawn-win64-helper gspawn-win64-helper-console
-gspawn_win64_helper_LDADD = libglib-2.0.la
-gspawn_win64_helper_LDFLAGS = -mwindows
-gspawn_win64_helper_console_LDADD = libglib-2.0.la
-else
-INSTALL_PROGS += gspawn-win32-helper gspawn-win32-helper-console
-gspawn_win32_helper_LDADD = libglib-2.0.la
-gspawn_win32_helper_LDFLAGS = -mwindows
-gspawn_win32_helper_console_LDADD = libglib-2.0.la
-endif
-endif
-
 glib-win32-res.o: glib.rc
 	$(WINDRES) glib.rc $@
 
-noinst_PROGRAMS	 = ${INSTALL_PROGS}
-
 if OS_UNIX
 
-INSTALL_PROGS	+= gtester
-gtester_SOURCES	 = gtester.c
-gtester_LDADD	 = libglib-2.0.la 
-
 auto_config_binscripts = gtester-report
-noinst_SCRIPTS = ${auto_config_binscripts}
 EXTRA_DIST += ${auto_config_binscripts}
 
 CONFIGVARS = \
@@ -437,10 +414,3 @@ dist-hook: $(BUILT_EXTRA_DIST)
 	done >libglib.vs10.sourcefiles.filters
 	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib.vcxproj.filtersin >$@	
 	rm libglib.vs10.sourcefiles.filters
-
-# install gdb scripts
-gdbdir = $(datadir)/glib-2.0/gdb
-dist_noinst_SCRIPTS = glib.py
-
-libglib-gdb.py: libglib-gdb.py.in
-	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
diff --git a/glib/glib/libglib-gdb.py.in b/glib/glib/libglib-gdb.py.in
deleted file mode 100644
index 3e07c42..0000000
--- a/glib/glib/libglib-gdb.py.in
+++ /dev/null
@@ -1,10 +0,0 @@
-import sys
-import gdb
-
-# Update module path.
-dir_ = '@datadir@/glib-2.0/gdb'
-if not dir_ in sys.path:
-    sys.path.insert(0, dir_)
-
-from glib import register
-register (gdb.current_objfile ())