X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2FMakefile.am;h=bc77dc1789e735f0984517a52ecc262dd3ce9208;hb=a3d86afa81ff34ce797a3928fd619ead219a37af;hp=560251fb6dd504a87e73db58450d78696cf470ed;hpb=dccce383670592f12510019e92ea91a618a1810c;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 560251f..bc77dc1 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -1,8 +1,5 @@
-include $(top_srcdir)/Makefile.decl
+include $(top_srcdir)/glib.mk
-NULL =
-
-DIST_SUBDIRS =
SUBDIRS = gdbus-2.0/codegen
if OS_UNIX
@@ -11,7 +8,7 @@ endif
if OS_WIN32_AND_DLL_COMPILATION
if MS_LIB_AVAILABLE
-noinst_DATA = gio-2.0.lib
+noinst_DATA += gio-2.0.lib
install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
@@ -24,16 +21,6 @@ install-ms-lib:
uninstall-ms-lib:
$(uninstall_ms_lib_cmd)
-gio.def: gio.symbols
- $(AM_V_GEN) (echo EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gio.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > $(builddir)/gio.def.tmp && \
- mv $(builddir)/gio.def.tmp $(builddir)/gio.def
-
-if OS_LINUX
-if HAVE_GNUC_VISIBILITY
-TESTS = abicheck.sh
-endif
-endif
-
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"GLib-GIO\" \
$(gmodule_INCLUDES) \
@@ -41,6 +28,8 @@ AM_CPPFLAGS = \
-DGIO_COMPILATION \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"
+AM_CFLAGS = $(GLIB_WARN_CFLAGS)
+
lib_LTLIBRARIES = libgio-2.0.la
gdbus_headers = \
@@ -99,12 +88,12 @@ gdbus_sources = \
$(NULL)
# These are not built into the library yet
-EXTRA_DIST += gdbusdaemon.c gdbusdaemon.h
+EXTRA_DIST += gdbusdaemon.c gdbusdaemon.h dbus-daemon.xml
-gdbus-daemon-generated.h gdbus-daemon-generated.c : dbus-daemon.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+gdbus-daemon-generated.h gdbus-daemon-generated.c: $(srcdir)/dbus-daemon.xml $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in
$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
+ $(PYTHON) $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in \
--interface-prefix org. \
--generate-c-code gdbus-daemon-generated \
--c-namespace _G \
@@ -156,12 +145,14 @@ application_headers = \
gactiongroupexporter.h \
gdbusactiongroup.h \
gaction.h \
+ gpropertyaction.h \
gsimpleaction.h \
\
gmenumodel.h \
gmenu.h \
gmenuexporter.h \
gdbusmenumodel.h \
+ gnotification.h \
$(NULL)
application_sources = \
@@ -175,14 +166,20 @@ application_sources = \
gsimpleactiongroup.c \
gremoteactiongroup.c \
gactiongroupexporter.c \
+ gdbusactiongroup-private.h \
gdbusactiongroup.c \
gaction.c \
+ gpropertyaction.c \
gsimpleaction.c \
\
gmenumodel.c \
gmenu.c \
gmenuexporter.c \
gdbusmenumodel.c \
+ gnotification-private.h \
+ gnotificationbackend.h \
+ gnotification.c \
+ gnotificationbackend.c \
$(NULL)
local_sources = \
@@ -210,6 +207,8 @@ local_sources = \
gsocks4aproxy.h \
gsocks5proxy.c \
gsocks5proxy.h \
+ thumbnail-verify.h \
+ thumbnail-verify.c \
$(NULL)
platform_libadd =
@@ -222,6 +221,12 @@ platform_libadd += inotify/libinotify.la
platform_deps += inotify/libinotify.la
endif
+if HAVE_KQUEUE
+SUBDIRS += kqueue
+platform_libadd += kqueue/libkqueue.la
+platform_deps += kqueue/libkqueue.la
+endif
+
if HAVE_FEN
AM_CPPFLAGS += -DHAVE_FEN
SUBDIRS += fen
@@ -235,7 +240,7 @@ platform_libadd += win32/libgiowin32.la
platform_deps += win32/libgiowin32.la
endif
-SUBDIRS += .
+SUBDIRS += . tests
if HAVE_FAM
SUBDIRS += fam
@@ -243,7 +248,7 @@ endif
if OS_UNIX
appinfo_sources += gdesktopappinfo.c
-platform_libadd += xdgmime/libxdgmime.la $(RESOLVER_LIBADD)
+platform_libadd += xdgmime/libxdgmime.la
platform_deps += xdgmime/libxdgmime.la
unix_sources = \
gfiledescriptorbased.c \
@@ -261,6 +266,10 @@ unix_sources = \
gunixvolumemonitor.h \
gunixinputstream.c \
gunixoutputstream.c \
+ gcontenttype.c \
+ gcontenttypeprivate.h \
+ gfdonotificationbackend.c \
+ ggtknotificationbackend.c \
$(NULL)
@@ -295,6 +304,7 @@ gdbus_daemon_sources = \
win32_actual_sources = \
$(gdbus_daemon_sources) \
+ gcontenttype-win32.c \
gwin32mount.c \
gwin32mount.h \
gwin32volumemonitor.c \
@@ -315,7 +325,7 @@ win32_more_sources_for_vcproj = \
if OS_WIN32
appinfo_sources += gwin32appinfo.c gwin32appinfo.h
-platform_libadd += -lshlwapi -lws2_32 -ldnsapi
+platform_libadd += -lshlwapi -lws2_32 -ldnsapi -liphlpapi
win32_sources = $(win32_actual_sources)
giowin32includedir=$(includedir)/gio-win32-2.0/gio
@@ -326,28 +336,23 @@ giowin32include_HEADERS = \
endif
-if BUILD_MODULAR_TESTS
-SUBDIRS += tests
-else
-DIST_SUBDIRS += tests
-endif
-
libgio_2_0_la_SOURCES = \
gappinfo.c \
+ gappinfoprivate.h \
gasynchelper.c \
gasynchelper.h \
gasyncinitable.c \
gasyncresult.c \
gbufferedinputstream.c \
gbufferedoutputstream.c \
+ gbytesicon.c \
gcancellable.c \
- gcontenttype.c \
- gcontenttypeprivate.h \
gcharsetconverter.c \
gconverter.c \
gconverterinputstream.c \
gconverteroutputstream.c \
gcredentials.c \
+ gcredentialsprivate.h \
gdatainputstream.c \
gdataoutputstream.c \
gdrive.c \
@@ -387,7 +392,11 @@ libgio_2_0_la_SOURCES = \
giomodule-priv.h \
gioscheduler.c \
giostream.c \
+ gioprivate.h \
+ giowin32-priv.h \
gloadableicon.c \
+ gkdbus.c \
+ gkdbusconnection.c \
gmount.c \
gmemoryinputstream.c \
gmemoryoutputstream.c \
@@ -395,6 +404,7 @@ libgio_2_0_la_SOURCES = \
gnativevolumemonitor.c \
gnativevolumemonitor.h \
gnetworkaddress.c \
+ gnetworking.c \
gnetworkingprivate.h \
gnetworkmonitor.c \
gnetworkmonitorbase.c \
@@ -407,6 +417,9 @@ libgio_2_0_la_SOURCES = \
gpollableutils.c \
gpollfilemonitor.c \
gpollfilemonitor.h \
+ gproxy.c \
+ gproxyaddress.c \
+ gproxyaddressenumerator.c \
gproxyresolver.c \
gresolver.c \
gresource.c \
@@ -427,11 +440,13 @@ libgio_2_0_la_SOURCES = \
gsocketlistener.c \
gsocketoutputstream.c \
gsocketoutputstream.h \
- gproxy.c \
- gproxyaddress.c \
- gproxyaddressenumerator.c \
+ gsubprocesslauncher.c \
+ gsubprocess.c \
+ gsubprocesslauncher-private.h \
gsocketservice.c \
gsrvtarget.c \
+ gsimpleproxyresolver.c \
+ gtask.c \
gtcpconnection.c \
gtcpwrapperconnection.c \
gthreadedsocketservice.c\
@@ -469,9 +484,9 @@ libgio_2_0_la_SOURCES = \
EXTRA_DIST += strinfo.c
libgio_2_0_la_LIBADD = \
- $(top_builddir)/glib/libglib-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la \
$(top_builddir)/gmodule/libgmodule-2.0.la \
+ $(top_builddir)/glib/libglib-2.0.la \
$(platform_libadd) \
$(ZLIB_LIBS) \
$(SELINUX_LIBS) \
@@ -487,38 +502,25 @@ no_undefined = -no-undefined
endif
if OS_WIN32_AND_DLL_COMPILATION
-export_symbols = -export-symbols $(builddir)/gio.def
-gio_def = gio.def
-
gio_win32_res = gio-win32-res.o
gio_win32_res_ldflag = -Wl,$(gio_win32_res)
-
-install-def-file:
- $(INSTALL) $(builddir)/gio.def $(DESTDIR)$(libdir)/gio-2.0.def
-
-uninstall-def-file:
- -rm $(DESTDIR)$(libdir)/gio-2.0.def
-else
-install-def-file:
-uninstall-def-file:
-
-export_symbols = $(LIBTOOL_EXPORT_OPTIONS)
endif
-install-data-local: install-ms-lib install-def-file
+install-data-local: install-ms-lib
$(mkinstalldirs) $(DESTDIR)$(GIO_MODULE_DIR)
-uninstall-local: uninstall-ms-lib uninstall-def-file
+uninstall-local: uninstall-ms-lib
+libgio_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS)
libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
$(gio_win32_res_ldflag) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -export-dynamic $(no_undefined) $(export_symbols)
+ -export-dynamic $(no_undefined)
if OS_COCOA
# This is dumb. The ObjC source file should be properly named .m
-libgio_2_0_la_CFLAGS = -xobjective-c
-libgio_2_0_la_LDFLAGS += -framework Foundation
+libgio_2_0_la_CFLAGS += -xobjective-c
+libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation
endif
libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
@@ -532,6 +534,7 @@ gio_headers = \
gasyncresult.h \
gbufferedinputstream.h \
gbufferedoutputstream.h \
+ gbytesicon.h \
gcancellable.h \
gcontenttype.h \
gcharsetconverter.h \
@@ -568,6 +571,8 @@ gio_headers = \
giomodule.h \
gioscheduler.h \
giostream.h \
+ gkdbus.h \
+ gkdbusconnection.h \
gloadableicon.h \
gmount.h \
gmemoryinputstream.h \
@@ -601,6 +606,10 @@ gio_headers = \
gsocketlistener.h \
gsocketservice.h \
gsrvtarget.h \
+ gsimpleproxyresolver.h \
+ gtask.h \
+ gsubprocess.h \
+ gsubprocesslauncher.h \
gtcpconnection.h \
gtcpwrapperconnection.h \
gthreadedsocketservice.h\
@@ -629,57 +638,67 @@ gioinclude_HEADERS = \
$(gio_headers) \
gioenumtypes.h
+nodist_gioinclude_HEADERS = \
+ gnetworking.h \
+ $(NULL)
+
# these sources (also mentioned above) are generated.
-BUILT_SOURCES = \
+BUILT_SOURCES += \
gconstructor_as_data.h \
gioenumtypes.h \
gioenumtypes.c \
gdbus-daemon-generated.c \
gdbus-daemon-generated.h \
+ gnetworking.h \
$(NULL)
EXTRA_DIST += \
data-to-c.pl \
- gio.symbols \
gioenumtypes.h.template \
gioenumtypes.c.template \
makefile.msc \
- abicheck.sh \
gio.rc.in \
gschema.dtd \
gconstructor_as_data.h \
+ gnetworking.h.win32 \
$(NULL)
-BUILT_EXTRA_DIST = \
+BUILT_EXTRA_DIST += \
gio.rc
# This is read by gobject-introspection/misc/ and gtk-doc
gio-public-headers.txt: Makefile
- echo $(gioinclude_HEADERS) $(giowin32include_HEADERS) $(giounixinclude_HEADERS) > $@.tmp && mv $@.tmp $@
+ $(AM_V_GEN) echo $(gioinclude_HEADERS) $(giowin32include_HEADERS) $(giounixinclude_HEADERS) > $@.tmp && mv $@.tmp $@
+
+CLEANFILES += gdbus-daemon-generated.c gdbus-daemon-generated.h gio-public-headers.txt gconstructor_as_data.h
-CLEANFILES = gdbus-daemon-generated.c gdbus-daemon-generated.h gio-public-headers.txt gconstructor_as_data.h
+
+DISTCLEANFILES += \
+ gioenumtypes.h \
+ gioenumtypes.c
all-local: gio-public-headers.txt
gioenumtypes.h: $(gio_headers) gioenumtypes.h.template
- $(AM_V_GEN) ( top_builddir=`cd $(top_builddir) && pwd`; \
- cd $(srcdir) && $$top_builddir/gobject/glib-mkenums --template gioenumtypes.h.template $(gio_headers) ) > \
+ $(AM_V_GEN) $(top_builddir)/gobject/glib-mkenums --template $(filter %.template,$^) $(filter-out %.template,$^) > \
gioenumtypes.h.tmp && mv gioenumtypes.h.tmp gioenumtypes.h
gioenumtypes.c: $(gio_headers) gioenumtypes.c.template
- $(AM_V_GEN) ( top_builddir=`cd $(top_builddir) && pwd`; \
- cd $(srcdir) && $$top_builddir/gobject/glib-mkenums --template gioenumtypes.c.template $(gio_headers) ) > \
+ $(AM_V_GEN) $(top_builddir)/gobject/glib-mkenums --template $(filter %.template,$^) $(filter-out %.template,$^) > \
gioenumtypes.c.tmp && mv gioenumtypes.c.tmp gioenumtypes.c
+gio.def: libgio-2.0.la
+ $(AM_V_GEN) dumpbin.exe -exports .libs/libgio-2.0-0.dll | awk 'BEGIN { print "EXPORTS" } / +[[:digit:]]+ +[[:xdigit:]]+ +[[:xdigit:]]+/{ print $$4 }' > gio.def.tmp && mv gio.def.tmp gio.def
+
gio-2.0.lib: libgio-2.0.la gio.def
- lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@
+ $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@
bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings
-glib_compile_resources_LDADD = \
- $(top_builddir)/glib/libglib-2.0.la \
+glib_compile_resources_LDADD = libgio-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la \
- libgio-2.0.la
+ $(top_builddir)/glib/libglib-2.0.la \
+ $(NULL)
glib_compile_resources_SOURCES = \
gvdb/gvdb-format.h \
@@ -688,11 +707,10 @@ glib_compile_resources_SOURCES = \
glib-compile-resources.c
gio_querymodules_SOURCES = gio-querymodules.c
-gio_querymodules_LDADD = \
- $(top_builddir)/glib/libglib-2.0.la \
+gio_querymodules_LDADD = libgio-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la \
$(top_builddir)/gmodule/libgmodule-2.0.la \
- libgio-2.0.la \
+ $(top_builddir)/glib/libglib-2.0.la \
$(NULL)
gconstructor_as_data.h: $(top_srcdir)/glib/gconstructor.h data-to-c.pl
@@ -706,10 +724,10 @@ glib_compile_schemas_SOURCES = \
gvdb/gvdb-builder.c \
glib-compile-schemas.c
-gsettings_LDADD = \
- $(top_builddir)/glib/libglib-2.0.la \
+gsettings_LDADD = libgio-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la \
- libgio-2.0.la
+ $(top_builddir)/glib/libglib-2.0.la \
+ $(NULL)
gsettings_SOURCES = gsettings-tool.c
schemadir = $(datadir)/glib-2.0/schemas
@@ -720,15 +738,28 @@ dist_schema_DATA = gschema.dtd
bin_PROGRAMS += gdbus
gdbus_SOURCES = gdbus-tool.c
-gdbus_LDADD = libgio-2.0.la \
- $(top_builddir)/glib/libglib-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la
+gdbus_LDADD = libgio-2.0.la \
+ $(top_builddir)/gobject/libgobject-2.0.la \
+ $(top_builddir)/glib/libglib-2.0.la \
+ $(NULL)
-completiondir = $(sysconfdir)/bash_completion.d
+if OS_UNIX
+# ------------------------------------------------------------------------
+# gapplication(1) tool
+bin_PROGRAMS += gapplication
+gapplication_SOURCES = gapplication-tool.c
+gapplication_LDADD = libgio-2.0.la \
+ $(top_builddir)/gobject/libgobject-2.0.la \
+ $(top_builddir)/glib/libglib-2.0.la \
+ $(NULL)
+endif
+
+completiondir = $(datadir)/bash-completion/completions
completion_DATA = \
- gdbus-bash-completion.sh \
- gsettings-bash-completion.sh \
- gresource-bash-completion.sh
+ completion/gapplication \
+ completion/gdbus \
+ completion/gsettings \
+ completion/gresource
EXTRA_DIST += $(completion_DATA)
# ------------------------------------------------------------------------
@@ -737,9 +768,9 @@ EXTRA_DIST += $(completion_DATA)
bin_PROGRAMS += gresource
gresource_SOURCES = gresource-tool.c
gresource_CPPFLAGS = $(LIBELF_CFLAGS) $(AM_CPPFLAGS)
-gresource_LDADD = libgio-2.0.la \
- $(top_builddir)/glib/libglib-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la \
+gresource_LDADD = libgio-2.0.la \
+ $(top_builddir)/gobject/libgobject-2.0.la \
+ $(top_builddir)/glib/libglib-2.0.la \
$(LIBELF_LIBS)
# ------------------------------------------------------------------------
@@ -753,7 +784,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10
../build/win32/vs9/gio.vcproj: $(top_srcdir)/build/win32/vs9/gio.vcprojin
for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \
case $$F in \
- gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c) ;; \
+ gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \
*.c) echo ' ' \
;; \
esac; \
@@ -764,7 +795,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10
../build/win32/vs10/gio.vcxproj: $(top_srcdir)/build/win32/vs10/gio.vcxprojin
for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \
case $$F in \
- gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c) ;; \
+ gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \
*.c) echo ' ' \
;; \
esac; \
@@ -775,7 +806,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10
../build/win32/vs10/gio.vcxproj.filters: $(top_srcdir)/build/win32/vs10/gio.vcxproj.filtersin
for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \
case $$F in \
- gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c) ;; \
+ gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \
*.c) echo ' Source Files' \
;; \
esac; \