Make things compile again

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

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 012ab08..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,6 +112,7 @@ uninstall-ms-lib:
 
 deprecated_sources = \
        deprecated/gallocator.c         \
+       deprecated/gcache.c             \
        deprecated/gcompletion.c        \
        deprecated/grel.c               \
        deprecated/gthread-deprecated.c
@@ -131,7 +131,7 @@ libglib_2_0_la_SOURCES =    \
        gbsearcharray.h         \
        gbuffer.c               \
        gbufferprivate.h        \
-       gcache.c                \
+       gcharset.c              \
        gchecksum.c             \
        gconvert.c              \
        gdataset.c              \
@@ -139,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                 \
@@ -186,6 +188,7 @@ libglib_2_0_la_SOURCES =    \
        gthreadpool.c           \
        gtimer.c                \
        gtimezone.c             \
+       gtrashstack.c           \
        gtree.c                 \
        guniprop.c              \
        gutf8.c                 \
@@ -210,6 +213,7 @@ libglib_2_0_la_SOURCES =    \
        gvarianttypeinfo.h      \
        gvarianttypeinfo.c      \
        gvarianttype.c          \
+       gversion.c              \
        gwakeup.h               \
        gwakeup.c               \
        gprintf.c               \
@@ -241,12 +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/gthread.h
 
 glibsubincludedir=$(includedir)/glib-2.0/glib
-glibsubinclude_HEADERS =   \
+glibsubinclude_HEADERS = \
        galloca.h       \
        garray.h        \
        gasyncqueue.h   \
@@ -254,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         \
@@ -304,6 +311,7 @@ glibsubinclude_HEADERS =   \
        gthreadpool.h   \
        gtimer.h        \
        gtimezone.h     \
+       gtrashstack.h   \
        gtree.h         \
        gtypes.h        \
        gunicode.h      \
@@ -311,6 +319,7 @@ glibsubinclude_HEADERS =   \
        gutils.h        \
        gvarianttype.h  \
        gvariant.h      \
+       gversion.h      \
        gwin32.h        \
        gprintf.h