X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2FMakefile.am;h=bc77dc1789e735f0984517a52ecc262dd3ce9208;hb=a3d86afa81ff34ce797a3928fd619ead219a37af;hp=94d7f59ba21793c6c2e2484b4b9f58064fecabe9;hpb=156b14cde5423c5bdaf8f28f1a8a5a0b54fbe455;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 94d7f59..bc77dc1 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -1,6 +1,4 @@
-include $(top_srcdir)/Makefile.decl
-
-NULL =
+include $(top_srcdir)/glib.mk
 
 SUBDIRS = gdbus-2.0/codegen
 
@@ -10,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
@@ -147,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 = \
@@ -169,12 +169,17 @@ application_sources = \
 	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 = \
@@ -202,6 +207,8 @@ local_sources = \
 	gsocks4aproxy.h			\
 	gsocks5proxy.c			\
 	gsocks5proxy.h			\
+	thumbnail-verify.h		\
+	thumbnail-verify.c		\
 	$(NULL)
 
 platform_libadd =
@@ -233,7 +240,7 @@ platform_libadd += win32/libgiowin32.la
 platform_deps += win32/libgiowin32.la
 endif
 
-SUBDIRS += .
+SUBDIRS += . tests
 
 if HAVE_FAM
 SUBDIRS += fam
@@ -241,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 +268,8 @@ unix_sources = \
 	gunixoutputstream.c 	\
 	gcontenttype.c 		\
 	gcontenttypeprivate.h 	\
+	gfdonotificationbackend.c \
+	ggtknotificationbackend.c \
 	$(NULL)
 
 
@@ -316,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
@@ -327,24 +336,23 @@ giowin32include_HEADERS = \
 
 endif
 
-if BUILD_MODULAR_TESTS
-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 		\
 	gcharsetconverter.c	\
 	gconverter.c		\
 	gconverterinputstream.c	\
 	gconverteroutputstream.c	\
 	gcredentials.c		\
+	gcredentialsprivate.h	\
 	gdatainputstream.c 	\
 	gdataoutputstream.c 	\
 	gdrive.c 		\
@@ -384,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 	\
@@ -428,6 +440,9 @@ libgio_2_0_la_SOURCES =		\
 	gsocketlistener.c	\
 	gsocketoutputstream.c	\
 	gsocketoutputstream.h	\
+	gsubprocesslauncher.c	\
+	gsubprocess.c		\
+	gsubprocesslauncher-private.h	\
 	gsocketservice.c	\
 	gsrvtarget.c		\
 	gsimpleproxyresolver.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) 				\
@@ -519,6 +534,7 @@ gio_headers =			\
 	gasyncresult.h 		\
 	gbufferedinputstream.h 	\
 	gbufferedoutputstream.h \
+	gbytesicon.h		\
 	gcancellable.h 		\
 	gcontenttype.h 		\
 	gcharsetconverter.h	\
@@ -555,6 +571,8 @@ gio_headers =			\
 	giomodule.h 		\
 	gioscheduler.h 		\
 	giostream.h		\
+	gkdbus.h                \
+	gkdbusconnection.h	\
 	gloadableicon.h 	\
 	gmount.h 		\
 	gmemoryinputstream.h 	\
@@ -562,7 +580,6 @@ gio_headers =			\
 	gmountoperation.h 	\
 	gnativevolumemonitor.h 	\
 	gnetworkaddress.h	\
-	gnetworking.h		\
 	gnetworkmonitor.h	\
 	gnetworkservice.h	\
 	goutputstream.h 	\
@@ -591,6 +608,8 @@ gio_headers =			\
 	gsrvtarget.h		\
 	gsimpleproxyresolver.h	\
 	gtask.h			\
+	gsubprocess.h		\
+	gsubprocesslauncher.h	\
 	gtcpconnection.h	\
 	gtcpwrapperconnection.h \
 	gthreadedsocketservice.h\
@@ -619,8 +638,12 @@ 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		\
@@ -640,17 +663,17 @@ EXTRA_DIST += 			\
 	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
 	$(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 = 		\
+DISTCLEANFILES += 		\
 	gioenumtypes.h		\
 	gioenumtypes.c
 
@@ -664,15 +687,18 @@ gioenumtypes.c: $(gio_headers) gioenumtypes.c.template
 	$(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		\
@@ -681,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
@@ -699,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
@@ -713,12 +738,25 @@ 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)
+
+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 = \
+	completion/gapplication				\
 	completion/gdbus				\
 	completion/gsettings				\
 	completion/gresource
@@ -730,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)
 
 # ------------------------------------------------------------------------