Cygwin support contributed by Stefan Ondrejicka <ondrej@idata.sk>.

[platform/upstream/glib.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 67d7160..cd0f964 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,11 +4,8 @@ AUTOMAKE_OPTIONS = 1.4
 
 SUBDIRS = . gobject gmodule gthread docs tests build
 
-bin_SCRIPTS=glib-config-2.0
-BUILT_SOURCES=glib-config-2.0
-glib-config-2.0: glib-config-2.0.in
-
-INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
+INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
+       -DG_DISABLE_COMPAT_H -DGLIB_COMPILATION
 
 EXTRA_DIST =                   \
        ChangeLog.pre-1-2       \
@@ -21,17 +18,15 @@ EXTRA_DIST =                        \
        glib.def                \
        makefile.msc.in         \
        makefile.mingw.in       \
-       giowin32.c              \
        glibconfig.h.win32.in   \
-       gwin32.c                \
-       gspawn-win32.c          \
        config.h.win32.in       \
        build-dll               \
        glib.rc.in              \
        glib-2.0.pc.in          \
        gobject-2.0.pc.in       \
        gmodule-2.0.pc.in       \
-       gthread-2.0.pc.in
+       gthread-2.0.pc.in       \
+       gen-unicode-tables.pl
 
 # These may be in the builddir too
 BUILT_EXTRA_DIST = \
@@ -58,20 +53,21 @@ libglib_1_3_la_SOURCES =    \
        ghash.c                 \
        ghook.c                 \
        giochannel.c            \
-       giounix.c               \
+       glibintl.h              \
        glist.c                 \
        gmain.c                 \
+       gmarkup.c               \
        gmem.c                  \
        gmessages.c             \
        gnode.c                 \
        gprimes.c               \
+       gqsort.c                \
        gqueue.c                \
        grel.c                  \
        grand.c                 \
        gscanner.c              \
        gshell.c                \
        gslist.c                \
-       gspawn.c                \
        gstrfuncs.c             \
        gstring.c               \
        gthread.c               \
@@ -80,13 +76,19 @@ libglib_1_3_la_SOURCES =    \
        gtree.c                 \
        guniprop.c              \
        gutf8.c                 \
+       gunibreak.h             \
+       gunibreak.c             \
        gunichartables.h        \
        gunidecomp.h            \
        gunidecomp.c            \
        gutils.c
 
-## If we decide to link in 'alloca.c', this is how to do it
-#libglib_1_3_la_LIBADD = @ALLOCA@
+EXTRA_libglib_1_3_la_SOURCES = \
+       giounix.c       \
+       giowin32.c      \
+       gspawn.c        \
+       gspawn-win32.c  \
+       gwin32.c
 
 glibincludedir=$(includedir)/glib-2.0
 glibinclude_HEADERS =   \
@@ -95,6 +97,7 @@ glibinclude_HEADERS =   \
        gasyncqueue.h   \
        gbacktrace.h    \
        gcache.h        \
+       gcompat.h       \
        gcompletion.h   \
        gconvert.h      \
        gdataset.h      \
@@ -109,10 +112,12 @@ glibinclude_HEADERS =   \
        glist.h         \
        gmacros.h       \
        gmain.h         \
+       gmarkup.h       \
        gmem.h          \
        gmessages.h     \
        gnode.h         \
        gprimes.h       \
+       gqsort.h        \
        gquark.h        \
        gqueue.h        \
        grand.h         \
@@ -151,15 +156,36 @@ stamp-gc-h: config.status
        CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status
        echo timestamp > stamp-gc-h
 
+libglib_1_3_la_LIBADD = @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@
+libglib_1_3_la_DEPENDENCIES = @GIO@ @GSPAWN@ @PLATFORMDEP@ 
+
+
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+if OS_WIN32
+# This requires a very new libtool
+export_symbols = -export-symbols glib.def
+endif
+
 libglib_1_3_la_LDFLAGS = \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-       -export-dynamic
-
-noinst_PROGRAMS = testglib testgdate testgdateparser
+       -export-dynamic $(no_undefined) $(export_symbols)
+
+if OS_WIN32
+bin_PROGRAMS = gspawn-win32-helper
+gspawn_win32_helper_LDADD = libglib-1.3.la
+endif
+if ENABLE_TIMELOOP
+timeloop = timeloop
+endif
+noinst_PROGRAMS = testglib testgdate testgdateparser $(timeloop)
 testglib_LDADD = libglib-1.3.la
 testgdate_LDADD = libglib-1.3.la
 testgdateparser_LDADD = libglib-1.3.la
-
+if ENABLE_TIMELOOP
+timeloop_LDADD = libglib-1.3.la
+endif
 m4datadir = $(datadir)/aclocal
 m4data_DATA = glib-2.0.m4
 
@@ -181,6 +207,10 @@ makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/makefile.mingw.in
 glib.rc: $(top_builddir)/config.status $(top_srcdir)/glib.rc.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+bin_SCRIPTS=glib-config-2.0
+BUILT_SOURCES=glib-config-2.0
+glib-config-2.0: glib-config-2.0.in
+
 .PHONY: files release sanity snapshot
 
 files: