X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2FMakefile.am;h=e993e2fef1e5206f9179000687be59ac653c91d7;hb=d9ad40b4eaf1a9197ab363de4346a8d84f45f5c1;hp=28d6f48cd320827c9429a5cebf7b01682fdfc651;hpb=c45b26d61f6539dbf4e202aded08d9614b441f81;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 28d6f48..e993e2f 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -337,7 +337,6 @@ giowin32include_HEADERS = \
 endif
 
 libgio_2_0_la_SOURCES =		\
-	gappinfoprivate.h	\
 	gappinfo.c 		\
 	gappinfoprivate.h	\
 	gasynchelper.c 		\
@@ -483,9 +482,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) 				\
@@ -684,15 +683,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		\
@@ -701,11 +703,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
@@ -719,10 +720,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
@@ -733,18 +734,20 @@ 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 \
+gapplication_LDADD = libgio-2.0.la 			\
+	$(top_builddir)/gobject/libgobject-2.0.la	\
 	$(top_builddir)/glib/libglib-2.0.la		\
-	$(top_builddir)/gobject/libgobject-2.0.la
+	$(NULL)
 endif
 
 completiondir = $(datadir)/bash-completion/completions
@@ -761,9 +764,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)
 
 # ------------------------------------------------------------------------