projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
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
5d005f5
..
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) \
$(pcre_inc) \
-DG_LOG_DOMAIN=\"GLib\" \
$(GLIB_DEBUG_FLAGS) \
- -DG_DISABLE_DEPRECATED \
-DGLIB_COMPILATION \
-DPCRE_STATIC
-DGLIB_COMPILATION \
-DPCRE_STATIC
@@
-113,14
+112,17
@@
uninstall-ms-lib:
deprecated_sources = \
deprecated/gallocator.c \
deprecated_sources = \
deprecated/gallocator.c \
+ deprecated/gcache.c \
deprecated/gcompletion.c \
deprecated/gcompletion.c \
- deprecated/grel.c
+ deprecated/grel.c \
+ deprecated/gthread-deprecated.c
libglib_2_0_la_SOURCES = \
$(deprecated_sources) \
glib_probes.d \
garray.c \
gasyncqueue.c \
libglib_2_0_la_SOURCES = \
$(deprecated_sources) \
glib_probes.d \
garray.c \
gasyncqueue.c \
+ gasyncqueueprivate.h \
gatomic.c \
gbacktrace.c \
gbase64.c \
gatomic.c \
gbacktrace.c \
gbase64.c \
@@
-129,7
+131,7
@@
libglib_2_0_la_SOURCES = \
gbsearcharray.h \
gbuffer.c \
gbufferprivate.h \
gbsearcharray.h \
gbuffer.c \
gbufferprivate.h \
- gc
ache.c
\
+ gc
harset.c
\
gchecksum.c \
gconvert.c \
gdataset.c \
gchecksum.c \
gconvert.c \
gdataset.c \
@@
-137,8
+139,10
@@
libglib_2_0_la_SOURCES = \
gdate.c \
gdatetime.c \
gdir.c \
gdate.c \
gdatetime.c \
gdir.c \
+ genviron.c \
gerror.c \
gfileutils.c \
gerror.c \
gfileutils.c \
+ ggettext.c \
ghash.c \
ghmac.c \
ghook.c \
ghash.c \
ghmac.c \
ghook.c \
@@
-147,7
+151,8
@@
libglib_2_0_la_SOURCES = \
gkeyfile.c \
glibintl.h \
glib_trace.h \
gkeyfile.c \
glibintl.h \
glib_trace.h \
- glib-ctor.h \
+ glib-init.h \
+ glib-init.c \
glib-private.h \
glib-private.c \
glist.c \
glib-private.h \
glib-private.c \
glist.c \
@@
-176,12
+181,14
@@
libglib_2_0_la_SOURCES = \
gstdio.c \
gstrfuncs.c \
gstring.c \
gstdio.c \
gstrfuncs.c \
gstring.c \
+ gstringchunk.c \
gtestutils.c \
gtestutils.c \
- gthread.c \
+ gthread.c \
gthreadprivate.h \
gthreadprivate.h \
- gthreadpool.c \
+ gthreadpool.c \
gtimer.c \
gtimezone.c \
gtimer.c \
gtimezone.c \
+ gtrashstack.c \
gtree.c \
guniprop.c \
gutf8.c \
gtree.c \
guniprop.c \
gutf8.c \
@@
-206,6
+213,7
@@
libglib_2_0_la_SOURCES = \
gvarianttypeinfo.h \
gvarianttypeinfo.c \
gvarianttype.c \
gvarianttypeinfo.h \
gvarianttypeinfo.c \
gvarianttype.c \
+ gversion.c \
gwakeup.h \
gwakeup.c \
gprintf.c \
gwakeup.h \
gwakeup.c \
gprintf.c \
@@
-237,12
+245,13
@@
glibinclude_HEADERS = \
deprecatedincludedir=$(includedir)/glib-2.0/glib/deprecated
deprecatedinclude_HEADERS = \
deprecated/gallocator.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
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 \
galloca.h \
garray.h \
gasyncqueue.h \
@@
-250,16
+259,18
@@
glibsubinclude_HEADERS = \
gbacktrace.h \
gbase64.h \
gbitlock.h \
gbacktrace.h \
gbase64.h \
gbitlock.h \
- gbookmarkfile.h \
- gc
ache.h
\
+ gbookmarkfile.h \
+ gc
harset.h
\
gchecksum.h \
gconvert.h \
gdataset.h \
gdate.h \
gchecksum.h \
gconvert.h \
gdataset.h \
gdate.h \
- gdatetime.h \
+ gdatetime.h \
gdir.h \
gdir.h \
+ genviron.h \
gerror.h \
gfileutils.h \
gerror.h \
gfileutils.h \
+ ggettext.h \
ghash.h \
ghmac.h \
ghook.h \
ghash.h \
ghmac.h \
ghook.h \
@@
-295,10
+306,12
@@
glibsubinclude_HEADERS = \
gstrfuncs.h \
gtestutils.h \
gstring.h \
gstrfuncs.h \
gtestutils.h \
gstring.h \
+ gstringchunk.h \
gthread.h \
gthreadpool.h \
gtimer.h \
gtimezone.h \
gthread.h \
gthreadpool.h \
gtimer.h \
gtimezone.h \
+ gtrashstack.h \
gtree.h \
gtypes.h \
gunicode.h \
gtree.h \
gtypes.h \
gunicode.h \
@@
-306,6
+319,7
@@
glibsubinclude_HEADERS = \
gutils.h \
gvarianttype.h \
gvariant.h \
gutils.h \
gvarianttype.h \
gvariant.h \
+ gversion.h \
gwin32.h \
gprintf.h
gwin32.h \
gprintf.h