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

Build gtestutils etc on OS_UNIX only.

Browse Source 
2007-11-25  Tor Lillqvist  <tml@novell.com>

	* glib/Makefile.am: Build gtestutils etc on OS_UNIX only.


svn path=/trunk/; revision=5934
This commit is contained in:
Tor Lillqvist
2007-11-25 21:39:42 +00:00
committed by Tor Lillqvist
parent d2f111fca7
commit d2b9634cb7
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
2007-11-25 Tor Lillqvist <tml@novell.com>
* glib/Makefile.am: Build gtestutils etc on OS_UNIX only.
2007-11-25 Matthias Clasen <mclasen@redhat.com> 2007-11-25 Matthias Clasen <mclasen@redhat.com>
* configure.in: Require gtk-doc 1.8. * configure.in: Require gtk-doc 1.8.

15
glib/Makefile.am
View File

@@ -19,7 +19,13 @@ gregex_c =
gregex_h = gregex_h =
endif endif
SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests if OS_UNIX
gtestutils_c = gtestutils.c
gtestutils_h = gtestutils.h
tests_subdir = tests
endif
SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . $(tests_subdir)
DIST_SUBDIRS = libcharset gnulib pcre update-pcre DIST_SUBDIRS = libcharset gnulib pcre update-pcre
@@ -140,7 +146,7 @@ libglib_2_0_la_SOURCES = \
gstdio.c \ gstdio.c \
gstrfuncs.c \ gstrfuncs.c \
gstring.c \ gstring.c \
gtestutils.c \ $(gtestutils_c) \
gthread.c \ gthread.c \
gthreadprivate.h \ gthreadprivate.h \
gthreadpool.c \ gthreadpool.c \
@@ -221,7 +227,7 @@ glibsubinclude_HEADERS = \
gspawn.h \ gspawn.h \
gstdio.h \ gstdio.h \
gstrfuncs.h \ gstrfuncs.h \
gtestutils.h \ $(gtestutils_h) \
gstring.h \ gstring.h \
gthread.h \ gthread.h \
gthreadpool.h \ gthreadpool.h \
@@ -304,10 +310,13 @@ endif
bin_PROGRAMS = ${INSTALL_PROGS} bin_PROGRAMS = ${INSTALL_PROGS}
if OS_UNIX
INSTALL_PROGS += gtester INSTALL_PROGS += gtester
gtester_SOURCES = gtester.c gtester_SOURCES = gtester.c
gtester_LDADD = libglib-2.0.la gtester_LDADD = libglib-2.0.la
endif
glib-2.0.lib: libglib-2.0.la glib.def glib-2.0.lib: libglib-2.0.la glib.def
lib -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:glib.def -out:$@ lib -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:glib.def -out:$@