projects / platform / upstream / glib.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Make things compile again
[platform/upstream/glib.git] / glib / Makefile.am
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 3823caf..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
 
@@ -111,10 +110,19 @@ install-ms-lib:
 uninstall-ms-lib:
        $(uninstall_ms_lib_cmd)
 
+deprecated_sources = \
+       deprecated/gallocator.c         \
+       deprecated/gcache.c             \
+       deprecated/gcompletion.c        \
+       deprecated/grel.c               \
+       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               \
@@ -123,24 +131,30 @@ libglib_2_0_la_SOURCES =  \
        gbsearcharray.h         \
        gbuffer.c               \
        gbufferprivate.h        \
-       gcache.c                \
+       gcharset.c              \
        gchecksum.c             \
-       gcompletion.c           \
        gconvert.c              \
        gdataset.c              \
        gdatasetprivate.h       \
        gdate.c                 \
        gdatetime.c             \
        gdir.c                  \
+       genviron.c              \
        gerror.c                \
        gfileutils.c            \
+       ggettext.c              \
        ghash.c                 \
+       ghmac.c                 \
        ghook.c                 \
        ghostutils.c            \
        giochannel.c            \
        gkeyfile.c              \
        glibintl.h              \
        glib_trace.h            \
+       glib-init.h             \
+       glib-init.c             \
+       glib-private.h          \
+       glib-private.c          \
        glist.c                 \
        gmain-internal.h        \
        gmain.c                 \
@@ -156,7 +170,6 @@ libglib_2_0_la_SOURCES =    \
        gprimes.c               \
        gqsort.c                \
        gqueue.c                \
-       grel.c                  \
        grand.c                 \
        $(gregex_c)             \
        gscanner.c              \
@@ -168,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                 \
@@ -198,15 +213,21 @@ libglib_2_0_la_SOURCES =  \
        gvarianttypeinfo.h      \
        gvarianttypeinfo.c      \
        gvarianttype.c          \
+       gversion.c              \
        gwakeup.h               \
        gwakeup.c               \
-       gdebug.h                \
        gprintf.c               \
        gprintfint.h
 
 if OS_UNIX
 libglib_2_0_la_SOURCES += glib-unix.c
-endif  
+endif
+
+if OS_WIN32
+libglib_2_0_la_SOURCES += gthread-win32.c
+else
+libglib_2_0_la_SOURCES += gthread-posix.c
+endif
 
 EXTRA_libglib_2_0_la_SOURCES = \
        giounix.c       \
@@ -221,9 +242,16 @@ glibinclude_HEADERS =   \
        glib-object.h   \
        glib.h
 
+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   \
@@ -231,18 +259,20 @@ glibsubinclude_HEADERS =   \
        gbacktrace.h    \
        gbase64.h       \
        gbitlock.h      \
-       gbookmarkfile.h \
-       gcache.h        \
+       gbookmarkfile.h \
+       gcharset.h      \
        gchecksum.h     \
-       gcompletion.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         \
        ghostutils.h    \
        gi18n.h         \
@@ -266,7 +296,6 @@ glibsubinclude_HEADERS =   \
        gqueue.h        \
        grand.h         \
        $(gregex_h)     \
-       grel.h          \
        gscanner.h      \
        gsequence.h     \
        gshell.h        \
@@ -277,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      \
@@ -288,6 +319,7 @@ glibsubinclude_HEADERS =   \
        gutils.h        \
        gvarianttype.h  \
        gvariant.h      \
+       gversion.h      \
        gwin32.h        \
        gprintf.h
 
@@ -345,7 +377,7 @@ pcre_lib =
 pcre_inc =
 endif
 
-libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) $(GLIB_RT_LIBS)
+libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) $(GLIB_RT_LIBS) $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD)
 libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def)
 
 libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
@@ -441,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'" />' \
                        ;; \
@@ -453,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'" />' \
                     ;; \
@@ -465,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>' \
                     ;; \
Domain: System / Base;