[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 d334bf5..95c7f09 100644 (file)
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -1,47 +1,85 @@
 ## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/glib.mk
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule \
-       -DG_LOG_DOMAIN=g_log_domain_gmodule @GLIB_DEBUG_FLAGS@
+AM_CPPFLAGS =                          \
+       $(glib_INCLUDES)                \
+       -DG_LOG_DOMAIN=\"GModule\"      \
+       @GLIB_DEBUG_FLAGS@              \
+       -DG_DISABLE_DEPRECATED
 
-EXTRA_DIST =   \
-               gmoduleconf.h.in \
-               gmodule.def     \
-               gmodule-dl.c    \
-               gmodule-dld.c   \
-               gmodule-win32.c \
-               gmoduleconf.h.win32
+AM_CFLAGS = $(GLIB_WARN_CFLAGS)
 
-BUILT_SOURCES = gmoduleconf.h
+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.msc    \
+               gmodule.rc
+
+BUILT_SOURCES += gmoduleconf.h
 gmoduleconf.h: gmoduleconf.h.in
 
-include_HEADERS = \
+glibincludedir=$(includedir)/glib-2.0
+glibinclude_HEADERS = \
                gmodule.h
 
-libglib = $(top_builddir)/libglib.la # -lglib
+libglib = $(top_builddir)/glib/libglib-2.0.la
+
+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
+
+install_ms_lib_cmd = $(INSTALL) gmodule-2.0.lib $(DESTDIR)$(libdir)
+uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gmodule-2.0.lib
+endif
+endif
+
+install-ms-lib:
+       $(install_ms_lib_cmd)
+
+uninstall-ms-lib:
+       $(uninstall_ms_lib_cmd)
+
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
 
-lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la
+if OS_WIN32_AND_DLL_COMPILATION
+gmodule_win32_res = gmodule-win32-res.o
+gmodule_win32_res_ldflag = -Wl,$(gmodule_win32_res)
+endif
 
-libgmodule_la_SOURCES = gmodule.c
-libgmodule_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) \
-       -release $(LT_RELEASE)
+       -export-dynamic $(no_undefined)
 
-libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
-# we should really depend on $(libglib) for libgmodule.la, but libtool has a
-# problem with this ;(
+libgmodule_2_0_la_LIBADD = $(G_MODULE_LIBS_EXTRA) $(G_MODULE_LIBS) $(libglib)
 
-libgplugin_a_la_SOURCES = libgplugin_a.c
-libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@
-libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
+libgmodule_2_0_la_DEPENDENCIES = $(gmodule_win32_res) $(gmodule_def)
 
-libgplugin_b_la_SOURCES = libgplugin_b.c
-libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@
-libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
+gmodule-win32-res.o: gmodule.rc
+       $(AM_V_GEN) $(WINDRES) gmodule.rc $@
 
-noinst_PROGRAMS = testgmodule
-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
-testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
+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
+       $(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
 
@@ -50,15 +88,25 @@ files:
          echo $$p; \
        done
 
-install-libLTLIBRARIES: libgmodule.la
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(libdir)
-       @list='libgmodule.la'; for p in $$list; do \
-        if test -f $$p; then \
-         echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
-         $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
-        else :; fi; \
-       done
-
 release:
        $(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
+
+dist-hook: $(BUILT_EXTRA_DIST)
+       @files='$(BUILT_EXTRA_DIST)'; \
+       for f in $$files; do \
+         if test -f $$f; then d=.; else d=$(srcdir); fi; \
+         cp $$d/$$f $(distdir) || exit 1; done
+
+
+install-data-local: install-ms-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