X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gmodule%2FMakefile.am;h=85d37dbfae17242a910c292a5bb2113784a4ab8f;hb=078dbda148a81af1b3a76fbda72f089b963087f1;hp=2f977287a99dce2fab2c0c6157a6ded6a0d89ee4;hpb=20af1ed3095e570c3aa8413f9c0d8f1ce4a554d6;p=platform%2Fupstream%2Fglib.git

diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index 2f97728..85d37db 100644
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -1,112 +1,82 @@
 ## Process this file with automake to produce Makefile.in
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule \
-	-DG_LOG_DOMAIN=\"GModule\" @GLIB_DEBUG_FLAGS@
-
-EXTRA_DIST =	\
-		makefile.mingw.in \
-		makefile.msc.in \
-		gmoduleconf.h.in \
-		gmodule.def	\
-		gmodule-dl.c	\
-		gmodule-dld.c	\
-		gmodule-os2.c	\
-		gmodule-win32.c	\
-		gmodule-beos.c	\
-		gmoduleconf.h.win32 \
+include $(top_srcdir)/glib.mk
+
+AM_CPPFLAGS = 				\
+	$(glib_INCLUDES) 		\
+	-DG_LOG_DOMAIN=\"GModule\" 	\
+	@GLIB_DEBUG_FLAGS@ 		\
+	-DG_DISABLE_DEPRECATED
+
+AM_CFLAGS = $(GLIB_WARN_CFLAGS)
+
+EXTRA_DIST +=				\
+		makefile.msc.in 	\
+		gmoduleconf.h.in 	\
+		gmodule-dl.c		\
+		gmodule-dyld.c		\
+		gmodule-win32.c		\
+		gmodule-ar.c		\
+		gmoduleconf.h.win32 	\
 		gmodule.rc.in
 
-BUILT_EXTRA_DIST = \
-		makefile.mingw	\
+BUILT_EXTRA_DIST += \
 		makefile.msc	\
 		gmodule.rc
 
-BUILT_SOURCES = gmoduleconf.h
+BUILT_SOURCES += gmoduleconf.h
 gmoduleconf.h:	gmoduleconf.h.in
 
 glibincludedir=$(includedir)/glib-2.0
 glibinclude_HEADERS = \
 		gmodule.h
 
-libglib = $(top_builddir)/glib/libglib-1.3.la
+libglib = $(top_builddir)/glib/libglib-2.0.la
 
 top_builddir_full=`cd \$(top_builddir); pwd`
 
-lib_LTLIBRARIES = libgmodule-1.3.la
-noinst_LTLIBRARIES = libgplugin_a.la libgplugin_b.la
+lib_LTLIBRARIES = libgmodule-2.0.la
 
+if OS_WIN32_AND_DLL_COMPILATION
 if MS_LIB_AVAILABLE
-noinst_DATA = gmodule-1.3.lib
+noinst_DATA += gmodule-2.0.lib
 
-install-ms-lib:
-	$(INSTALL) gmodule-1.3.lib $(DESTDIR)$(libdir)
+install_ms_lib_cmd = $(INSTALL) gmodule-2.0.lib $(DESTDIR)$(libdir)
+uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gmodule-2.0.lib
+endif
+endif
 
-uninstall-ms-lib:
-	-rm $(DESTDIR)$(libdir)/gmodule-1.3.lib
-else
 install-ms-lib:
+	$(install_ms_lib_cmd)
+
 uninstall-ms-lib:
-endif
+	$(uninstall_ms_lib_cmd)
 
 if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-if OS_WIN32
-export_symbols = -export-symbols gmodule.def
-plugin_rpath = -rpath `pwd`
-
-install-libtool-import-lib:
-	$(INSTALL) .libs/libgmodule-1.3.dll.a $(DESTDIR)$(libdir)
-uninstall-libtool-import-lib:
-	-rm $(DESTDIR)$(libdir)/libgmodule-1.3.dll.a
-else
-install-libtool-import-lib:
-uninstall-libtool-import-lib:
+if OS_WIN32_AND_DLL_COMPILATION
+gmodule_win32_res = gmodule-win32-res.o
+gmodule_win32_res_ldflag = -Wl,$(gmodule_win32_res)
 endif
 
-libgmodule_1_3_la_SOURCES = gmodule.c
-libgmodule_1_3_la_LDFLAGS = \
-	@G_MODULE_LDFLAGS@ \
+libgmodule_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS)
+libgmodule_2_0_la_SOURCES = gmodule.c
+libgmodule_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
+	$(gmodule_win32_res_ldflag) \
+	$(G_MODULE_LDFLAGS) \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-	-export-dynamic $(no_undefined) $(export_symbols)
+	-export-dynamic $(no_undefined)
 
-libgmodule_1_3_la_LIBADD = @G_MODULE_WIN32_RESOURCE@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(libglib)
+libgmodule_2_0_la_LIBADD = $(G_MODULE_LIBS_EXTRA) $(G_MODULE_LIBS) $(libglib)
 
-libgmodule_1_3_la_DEPENDENCIES = @G_MODULE_WIN32_RESOURCE@ @GMODULE_DEF@
+libgmodule_2_0_la_DEPENDENCIES = $(gmodule_win32_res) $(gmodule_def)
 
-libgplugin_a_la_SOURCES = libgplugin_a.c
-libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) $(plugin_rpath)
-libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ libgmodule-1.3.la $(libglib)
+gmodule-win32-res.o: gmodule.rc
+	$(AM_V_GEN) $(WINDRES) gmodule.rc $@
 
-libgplugin_b_la_SOURCES = libgplugin_b.c
-libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) $(plugin_rpath)
-libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ libgmodule-1.3.la $(libglib)
-
-noinst_PROGRAMS = testgmodule
-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
-testgmodule_LDADD = @TESTGMODULE_EXP@ libgmodule-1.3.la $(libglib) @G_MODULE_LIBS@
-testgmodule_DEPENDENCIES = @TESTGMODULE_EXP@
-
-if OS_WIN32
-@G_MODULE_WIN32_RESOURCE@ : gmodule.rc
-	$(top_srcdir)/build/win32/lt-compile-resource gmodule.rc @G_MODULE_WIN32_RESOURCE@
-endif
-
-gmodule-1.3.lib: libgmodule-1.3.la gmodule.def
-	lib -name:libgmodule-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gmodule.def -out:$@
-
-testgmodule.exp: testgmodule.o
-	dlltool --output-exp testgmodule.exp testgmodule.o
-
-gmodule.rc: $(top_builddir)/config.status $(top_srcdir)/gmodule/gmodule.rc.in
-	cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gmodule/makefile.mingw.in
-	cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gmodule/makefile.msc.in
-	cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+gmodule-2.0.lib: libgmodule-2.0.la gmodule.def
+	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgmodule-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gmodule.def -out:$@
 
 .PHONY: files release
 
@@ -125,6 +95,15 @@ dist-hook: $(BUILT_EXTRA_DIST)
 	  cp $$d/$$f $(distdir) || exit 1; done
 
 
-install-data-local: install-ms-lib install-libtool-import-lib
+install-data-local: install-ms-lib
 
-uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+uninstall-local: uninstall-ms-lib
+
+if HAVE_GLIB_RUNTIME_LIBDIR
+install-data-hook:
+	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+	mv $(DESTDIR)$(libdir)/libgmodule-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+	mv $(DESTDIR)$(libdir)/libgmodule-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+	rm -f $(DESTDIR)$(libdir)/libgmodule-2.0.so
+	ln -s $(GLIB_RUNTIME_LIBDIR)/libgmodule-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/libgmodule-2.0.so
+endif