gregex_h =
endif
-if HAVE_GCC_BUILTINS_FOR_ATOMIC_OPERATIONS
-gatomic_c = gatomic-gcc.c
-else
-gatomic_c = gatomic.c
-endif
-
SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
$(pcre_inc) \
-DG_LOG_DOMAIN=\"GLib\" \
$(GLIB_DEBUG_FLAGS) \
- -DG_DISABLE_DEPRECATED \
-DGLIB_COMPILATION \
-DPCRE_STATIC
glib.def: glib.symbols
- $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > glib.def
+ $(AM_V_GEN) (echo EXPORTS; $(CPP) -P -DG_OS_WIN32 - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/ /') > glib.def
if OS_LINUX
if HAVE_GNUC_VISIBILITY
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 \
- $(gatomic_c) \
+ gasyncqueueprivate.h \
+ gatomic.c \
gbacktrace.c \
gbase64.c \
gbitlock.c \
gbookmarkfile.c \
gbsearcharray.h \
gbuffer.c \
- gbuffer.h \
- gcache.c \
+ gbufferprivate.h \
+ 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 \
gmappedfile.c \
gmarkup.c \
gprimes.c \
gqsort.c \
gqueue.c \
- grel.c \
grand.c \
$(gregex_c) \
gscanner.c \
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 \
gvarianttypeinfo.h \
gvarianttypeinfo.c \
gvarianttype.c \
- gdebug.h \
+ gversion.c \
+ gwakeup.h \
+ gwakeup.c \
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 \
glibincludedir=$(includedir)/glib-2.0
glibinclude_HEADERS = \
+ glib-unix.h \
glib-object.h \
glib.h
-if OS_UNIX
-glibinclude_HEADERS += glib-unix.h
-endif
+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 \
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 \
gqueue.h \
grand.h \
$(gregex_h) \
- grel.h \
gscanner.h \
gsequence.h \
gshell.h \
gstrfuncs.h \
gtestutils.h \
gstring.h \
+ gstringchunk.h \
gthread.h \
gthreadpool.h \
gtimer.h \
gtimezone.h \
+ gtrashstack.h \
gtree.h \
gtypes.h \
gunicode.h \
gutils.h \
gvarianttype.h \
gvariant.h \
+ gversion.h \
gwin32.h \
gprintf.h
+# This is read by gobject-introspection/misc/ and gtk-doc
+glib-public-headers.txt: Makefile
+ echo $(glibinclude_HEADERS) $(glibsubinclude_HEADERS) > $@.tmp && mv $@.tmp $@
+
+CLEANFILES += glib-public-headers.txt
+
+all-local: glib-public-headers.txt
+
install-data-local: install-ms-lib install-def-file
@if test -f $(glibincludedir)/glist.h ; then \
echo "*** Old headers found in $(glibincludedir). You should remove the" ; \
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) \
if ENABLE_DTRACE
glib_probes.h: glib_probes.d Makefile
- $(DTRACE) -C -h -s $< -o $@.tmp
- sed -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
+ $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
+ @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
glib_probes.o: glib_probes.d Makefile
- $(DTRACE) -G -s $< -o $@
+ $(AM_V_GEN) $(DTRACE) -G -s $< -o $@
BUILT_SOURCES += glib_probes.h glib_probes.o
CLEANFILES += glib_probes.h glib_probes.h.tmp
libglib_2_0_la_LIBADD += glib_probes.o
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|gthread-*.c) \
;; \
*.c) echo ' <File RelativePath="..\..\..\glib\'$$F'" />' \
;; \
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|gthread-*.c) \
;; \
*.c) echo ' <ClCompile Include="..\..\..\glib\'$$F'" />' \
;; \
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|gthread-*.c) \
;; \
*.c) echo ' <ClCompile Include="..\..\..\glib\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
;; \
projects / platform / upstream / glib.git / blobdiff