win32: add gwin32compat.h, for utf8-renaming compatibility defines

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

diff --git a/glib/Makefile.am b/glib/Makefile.am
index ac73a8c..042eac9 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -35,9 +35,11 @@ else
 MAYBE_PCRE = pcre 
 endif
 
-SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
-
+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
 DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
+if BUILD_MODULAR_TESTS
+SUBDIRS += tests 
+endif
 
 AM_CPPFLAGS =                          \
        $(glib_INCLUDES)                \
@@ -82,7 +84,7 @@ EXTRA_DIST +=                         \
        gconstructor.h          \
        $(MIRRORING_TAB_SOURCE)
 
-CLEANFILES= libglib-gdb.py
+CLEANFILES += libglib-gdb.py
 
 # These may be in the builddir too
 BUILT_EXTRA_DIST =             \
@@ -129,6 +131,7 @@ libglib_2_0_la_SOURCES =    \
        gbytes.c                \
        gbytes.h                \
        gcharset.c              \
+       gcharsetprivate.h       \
        gchecksum.c             \
        gconvert.c              \
        gdataset.c              \
@@ -166,6 +169,7 @@ libglib_2_0_la_SOURCES =    \
        gpoll.c                 \
        gprimes.c               \
        gqsort.c                \
+       gquark.c                \
        gqueue.c                \
        grand.c                 \
        gregex.c                \
@@ -321,6 +325,7 @@ glibsubinclude_HEADERS = \
        gversion.h      \
        gversionmacros.h \
        gwin32.h        \
+       gwin32compat.h  \
        gprintf.h
 
 # This is read by gobject-introspection/misc/ and gtk-doc