[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header

[platform/upstream/glib.git] / gmodule / Makefile.am

diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index 4cf4a90..95c7f09 100644 (file)
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -1,26 +1,29 @@
 ## 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@ -DG_DISABLE_DEPRECATED
-
-EXTRA_DIST =   \
-               makefile.msc.in \
-               gmoduleconf.h.in \
-               gmodule.def     \
-               gmodule-dl.c    \
-               gmodule-dld.c   \
-               gmodule-dyld.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 = \
+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
@@ -33,54 +36,50 @@ top_builddir_full=`cd \$(top_builddir); pwd`
 
 lib_LTLIBRARIES = libgmodule-2.0.la
 
+if OS_WIN32_AND_DLL_COMPILATION
 if MS_LIB_AVAILABLE
-noinst_DATA = gmodule-2.0.lib
+noinst_DATA += gmodule-2.0.lib
 
-install-ms-lib:
-       $(INSTALL) gmodule-2.0.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-2.0.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 $(srcdir)/gmodule.def
-
-install-libtool-import-lib:
-       $(INSTALL) .libs/libgmodule-2.0.dll.a $(DESTDIR)$(libdir)
-       $(INSTALL) $(srcdir)/gmodule.def $(DESTDIR)$(libdir)/gmodule-2.0.def
-
-uninstall-libtool-import-lib:
-       -rm $(DESTDIR)$(libdir)/libgmodule-2.0.dll.a $(DESTDIR)$(libdir)/gmodule-2.0.def
-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_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS)
 libgmodule_2_0_la_SOURCES = gmodule.c
-libgmodule_2_0_la_LDFLAGS = \
+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_2_0_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_2_0_la_DEPENDENCIES = $(G_MODULE_WIN32_RESOURCE) $(GMODULE_DEF)
+libgmodule_2_0_la_DEPENDENCIES = $(gmodule_win32_res) $(gmodule_def)
 
-if OS_WIN32
-$(G_MODULE_WIN32_RESOURCE): gmodule.rc
-       $(top_srcdir)/build/win32/lt-compile-resource gmodule.rc $@
-endif
+gmodule-win32-res.o: gmodule.rc
+       $(AM_V_GEN) $(WINDRES) gmodule.rc $@
+
+gmodule.def: libgmodule-2.0.la
+       $(AM_V_GEN) dumpbin.exe -exports .libs/libgmodule-2.0-0.dll | awk 'BEGIN { print "EXPORTS" } / +[[:digit:]]+ +[[:xdigit:]]+ +[[:xdigit:]]+/{ print $$4 }' > gmodule.def.tmp && mv gmodule.def.tmp gmodule.def
 
 gmodule-2.0.lib: libgmodule-2.0.la gmodule.def
-       lib -name:libgmodule-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gmodule.def -out:$@
+       $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgmodule-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gmodule.def -out:$@
 
 .PHONY: files release
 
@@ -99,6 +98,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-local: uninstall-ms-lib uninstall-libtool-import-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