luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-16 04:28:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Portability improvements

Browse Source 
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.
This commit is contained in:
Tor Lillqvist 2010-04-19 12:25:22 +03:00
parent 9af8b83211
commit df8800e59a
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/Makefile.am
View File

@ -495,7 +495,12 @@ gioenumtypes.c: $(gio_headers) gioenumtypes.c.template
gio-2.0.lib: libgio-2.0.la gio.def 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:$@ 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_SOURCES = gio-querymodules.c
gio_querymodules_LDADD = \ gio_querymodules_LDADD = \
$(top_builddir)/glib/libglib-2.0.la \ $(top_builddir)/glib/libglib-2.0.la \

18
gio/tests/Makefile.am
View File

@ -10,7 +10,9 @@ INCLUDES = \
$(GLIB_DEBUG_FLAGS) \ $(GLIB_DEBUG_FLAGS) \
-DSRCDIR=\""$(srcdir)"\" -DSRCDIR=\""$(srcdir)"\"
noinst_PROGRAMS = $(TEST_PROGS) $(SAMPLE_PROGS) $(OTHER_PROGS) noinst_PROGRAMS = $(TEST_PROGS) $(SAMPLE_PROGS)
noinst_DATA = $(MISC_STUFF)
progs_ldadd = \ progs_ldadd = \
$(top_builddir)/glib/libglib-2.0.la \ $(top_builddir)/glib/libglib-2.0.la \
$(top_builddir)/gobject/libgobject-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_SOURCES = desktop-app-info.c
desktop_app_info_LDADD = $(progs_ldadd) desktop_app_info_LDADD = $(progs_ldadd)
unix_streams_SOURCES = unix-streams.c #unix_streams_SOURCES = unix-streams.c
unix_streams_LDADD = $(progs_ldadd) \ #unix_streams_LDADD = $(progs_ldadd) \
$(top_builddir)/gthread/libgthread-2.0.la # $(top_builddir)/gthread/libgthread-2.0.la
win32_streams_SOURCES = win32-streams.c win32_streams_SOURCES = win32-streams.c
win32_streams_LDADD = $(progs_ldadd) \ 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 EXTRA_DIST += org.gtk.test.gschema org.gtk.test.gschema.xml de.po
gschemas_compiled_SOURCES = MISC_STUFF = test.mo
test_mo_SOURCES =
OTHER_PROGS = gschemas.compiled test.mo if OS_UNIX
MISC_STUFF += gschemas.compiled
endif
test.mo: de.po test.mo: de.po
$(MSGFMT) -o test.mo $(srcdir)/de.po; \ $(MSGFMT) -o test.mo $(srcdir)/de.po; \