Make things compile again

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

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 7d11f45..2ed99ca 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -51,7 +51,6 @@ AM_CPPFLAGS =                                 \
        $(pcre_inc)                     \
        -DG_LOG_DOMAIN=\"GLib\"         \
        $(GLIB_DEBUG_FLAGS)             \
-       -DG_DISABLE_DEPRECATED          \
        -DGLIB_COMPILATION              \
        -DPCRE_STATIC
 
@@ -113,15 +112,17 @@ uninstall-ms-lib:
 
 deprecated_sources = \
        deprecated/gallocator.c         \
+       deprecated/gcache.c             \
        deprecated/gcompletion.c        \
        deprecated/grel.c               \
-       deprecated/gthread.h
+       deprecated/gthread-deprecated.c
 
 libglib_2_0_la_SOURCES =       \
        $(deprecated_sources)   \
        glib_probes.d           \
        garray.c                \
        gasyncqueue.c           \
+       gasyncqueueprivate.h    \
        gatomic.c               \
        gbacktrace.c            \
        gbase64.c               \
@@ -130,7 +131,7 @@ libglib_2_0_la_SOURCES =    \
        gbsearcharray.h         \
        gbuffer.c               \
        gbufferprivate.h        \
-       gcache.c                \
+       gcharset.c              \
        gchecksum.c             \
        gconvert.c              \
        gdataset.c              \
@@ -138,8 +139,10 @@ libglib_2_0_la_SOURCES =   \
        gdate.c                 \
        gdatetime.c             \
        gdir.c                  \
+       genviron.c              \
        gerror.c                \
        gfileutils.c            \
+       ggettext.c              \
        ghash.c                 \
        ghmac.c                 \
        ghook.c                 \
@@ -148,7 +151,8 @@ libglib_2_0_la_SOURCES =    \
        gkeyfile.c              \
        glibintl.h              \
        glib_trace.h            \
-       glib-ctor.h             \
+       glib-init.h             \
+       glib-init.c             \
        glib-private.h          \
        glib-private.c          \
        glist.c                 \
@@ -177,12 +181,14 @@ libglib_2_0_la_SOURCES =  \
        gstdio.c                \
        gstrfuncs.c             \
        gstring.c               \
+       gstringchunk.c          \
        gtestutils.c            \
-       gthread.c               \
+       gthread.c               \
        gthreadprivate.h        \
-       gthreadpool.c           \
+       gthreadpool.c           \
        gtimer.c                \
        gtimezone.c             \
+       gtrashstack.c           \
        gtree.c                 \
        guniprop.c              \
        gutf8.c                 \
@@ -207,6 +213,7 @@ libglib_2_0_la_SOURCES =    \
        gvarianttypeinfo.h      \
        gvarianttypeinfo.c      \
        gvarianttype.c          \
+       gversion.c              \
        gwakeup.h               \
        gwakeup.c               \
        gprintf.c               \
@@ -238,11 +245,13 @@ glibinclude_HEADERS =   \
 deprecatedincludedir=$(includedir)/glib-2.0/glib/deprecated
 deprecatedinclude_HEADERS = \
        deprecated/gallocator.h         \
+       deprecated/gcache.h             \
        deprecated/gcompletion.h        \
-       deprecated/grel.h
+       deprecated/grel.h               \
+       deprecated/gthread.h
 
 glibsubincludedir=$(includedir)/glib-2.0/glib
-glibsubinclude_HEADERS =   \
+glibsubinclude_HEADERS = \
        galloca.h       \
        garray.h        \
        gasyncqueue.h   \
@@ -250,16 +259,18 @@ glibsubinclude_HEADERS =   \
        gbacktrace.h    \
        gbase64.h       \
        gbitlock.h      \
-       gbookmarkfile.h \
-       gcache.h        \
+       gbookmarkfile.h \
+       gcharset.h      \
        gchecksum.h     \
        gconvert.h      \
        gdataset.h      \
        gdate.h         \
-       gdatetime.h     \
+       gdatetime.h     \
        gdir.h          \
+       genviron.h      \
        gerror.h        \
        gfileutils.h    \
+       ggettext.h      \
        ghash.h         \
        ghmac.h         \
        ghook.h         \
@@ -295,10 +306,12 @@ glibsubinclude_HEADERS =   \
        gstrfuncs.h     \
        gtestutils.h    \
        gstring.h       \
+       gstringchunk.h  \
        gthread.h       \
        gthreadpool.h   \
        gtimer.h        \
        gtimezone.h     \
+       gtrashstack.h   \
        gtree.h         \
        gtypes.h        \
        gunicode.h      \
@@ -306,6 +319,7 @@ glibsubinclude_HEADERS =   \
        gutils.h        \
        gvarianttype.h  \
        gvariant.h      \
+       gversion.h      \
        gwin32.h        \
        gprintf.h
 
@@ -459,9 +473,9 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs1
          cp $$d/$$f $(distdir) || exit 1; done
 
 ../build/win32/vs9/glib.vcproj: $(top_srcdir)/build/win32/vs9/glib.vcprojin
-       for F in $(libglib_2_0_la_SOURCES); do \
+       for F in `echo $(libglib_2_0_la_SOURCES) | tr '/' '\\'`; do \
                case $$F in \
-               *-gcc.c|*-unix.c) \
+               *-unix.c|gthread-*.c) \
                        ;; \
                *.c)    echo '   <File RelativePath="..\..\..\glib\'$$F'" />' \
                        ;; \
@@ -471,9 +485,9 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs1
        rm libglib.sourcefiles
 
 ../build/win32/vs10/glib.vcxproj: $(top_srcdir)/build/win32/vs10/glib.vcxprojin
-       for F in $(libglib_2_0_la_SOURCES); do \
+       for F in `echo $(libglib_2_0_la_SOURCES) | tr '/' '\\'`; do \
                case $$F in \
-               *-gcc.c|*-unix.c) \
+               *-unix.c|gthread-*.c) \
                        ;; \
                *.c) echo '    <ClCompile Include="..\..\..\glib\'$$F'" />' \
                     ;; \
@@ -483,9 +497,9 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs1
        rm libglib.vs10.sourcefiles
 
 ../build/win32/vs10/glib.vcxproj.filters: $(top_srcdir)/build/win32/vs10/glib.vcxproj.filtersin
-       for F in $(libglib_2_0_la_SOURCES); do \
+       for F in `echo $(libglib_2_0_la_SOURCES) | tr '/' '\\'`; do \
                case $$F in \
-               *-gcc.c|*-unix.c) \
+               *-unix.c|gthread-*.c) \
                        ;; \
                *.c) echo '    <ClCompile Include="..\..\..\glib\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
                     ;; \