[glib] Portability improvements

[Tor Lillqvist <tml src gnome org>]

commit df8800e59a88c011ed84e7a05c6ddeb2a9b38921
Author: Tor Lillqvist <tml iki fi>
Date:   Mon Apr 19 12:25:22 2010 +0300

    Portability improvements
    
    Gschema-compile uses glob which is available on Unix only. Thus can't
    run the gschema-compile test except on Unix either.
    
    To avoid an Automake error, comment out the SOURCES and LDADD of
    unix-streams which for some reason has been commented out from
    TEST_PROGS.
    
    Can't use a Makefile.am target called foo_PROGRAMS for random files
    that aren't actually programs, as Automake assumes EXEEXT should be
    appended to the file names.

 gio/Makefile.am       |    7 ++++++-
 gio/tests/Makefile.am |   18 +++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 8e3c185..4260900 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -495,7 +495,12 @@ gioenumtypes.c: $(gio_headers) gioenumtypes.c.template
 gio-2.0.lib: libgio-2.0.la gio.def
 	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gio.def -out:$@
 
-bin_PROGRAMS = gio-querymodules gschema-compile
+bin_PROGRAMS = gio-querymodules
+
+if OS_UNIX
+bin_PROGRAMS += gschema-compile
+endif
+
 gio_querymodules_SOURCES = gio-querymodules.c
 gio_querymodules_LDADD	 = \
 	$(top_builddir)/glib/libglib-2.0.la		\
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index ba3410d..a0c1499 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -10,7 +10,9 @@ INCLUDES = 			\
 	$(GLIB_DEBUG_FLAGS)	\
 	-DSRCDIR=\""$(srcdir)"\"
 
-noinst_PROGRAMS = $(TEST_PROGS) $(SAMPLE_PROGS) $(OTHER_PROGS)
+noinst_PROGRAMS = $(TEST_PROGS) $(SAMPLE_PROGS)
+noinst_DATA = $(MISC_STUFF)
+
 progs_ldadd     = 					\
 	$(top_builddir)/glib/libglib-2.0.la 		\
 	$(top_builddir)/gobject/libgobject-2.0.la	\
@@ -90,9 +92,9 @@ live_g_file_LDADD	  = $(progs_ldadd)
 desktop_app_info_SOURCES  = desktop-app-info.c
 desktop_app_info_LDADD	  = $(progs_ldadd)
 
-unix_streams_SOURCES	  = unix-streams.c
-unix_streams_LDADD	  = $(progs_ldadd) \
-	$(top_builddir)/gthread/libgthread-2.0.la
+#unix_streams_SOURCES	  = unix-streams.c
+#unix_streams_LDADD	  = $(progs_ldadd) \
+#	$(top_builddir)/gthread/libgthread-2.0.la
 
 win32_streams_SOURCES	  = win32-streams.c
 win32_streams_LDADD	  = $(progs_ldadd) \
@@ -146,9 +148,11 @@ gsettings_LDADD		  = $(progs_ldadd)
 
 EXTRA_DIST += org.gtk.test.gschema org.gtk.test.gschema.xml de.po
 
-gschemas_compiled_SOURCES =
-test_mo_SOURCES =
-OTHER_PROGS = gschemas.compiled test.mo
+MISC_STUFF = test.mo
+
+if OS_UNIX
+MISC_STUFF += gschemas.compiled 
+endif
 
 test.mo: de.po
 	$(MSGFMT) -o test.mo $(srcdir)/de.po; \