mingw ports fix to Makefile.am and configure.in, to

add -no-undefined.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@819 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index c5dfce8..e5317c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
        * */Makefile.am: Add WARN_CFLAGS to INCLUDES.
        Bug #308239.
+
+       * configure.in, */Makefile.am: mingw patch, modified from
+       original patch by yselkowitz.  Bug #314216.
        
 2006-06-12  Bill Haneman <bill.haneman@sun.com>
 

diff --git a/atk-bridge/Makefile.am b/atk-bridge/Makefile.am
index 62ed4e1..09fe81c 100644 (file)
--- a/atk-bridge/Makefile.am
+++ b/atk-bridge/Makefile.am
@@ -12,6 +12,7 @@ INCLUDES = -I $(top_srcdir) \
           -I $(top_srcdir)/libspi      \
           -I $(top_builddir)/libspi    \
            -I $(top_builddir)/atk-bridge \
+          $(WARN_CFLAGS)       \
            $(ATK_BRIDGE_CFLAGS)
 
 DEPS =         \
@@ -22,6 +23,9 @@ DEPS =        \
        $(libat-spi)
 
 libatk_bridge_la_LDFLAGS =     \
-       -rpath $(moduledir) -module -avoid-version \
-       @LDFLAGS@       \
-       $(top_builddir)/libspi/libspi.la
+       -rpath $(moduledir) -module -avoid-version -no-undefined \
+       @LDFLAGS@
+
+libatk_bridge_la_LIBADD = \
+       $(top_builddir)/libspi/libspi.la        \
+       $(ATK_BRIDGE_LIBS)      
\ No newline at end of file

diff --git a/configure.in b/configure.in
index 2107db0..890b12d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -121,6 +121,12 @@ PKG_CHECK_MODULES(LIBCSPI, [
 AC_SUBST(LIBCSPI_LIBS)
 AC_SUBST(LIBCSPI_CFLAGS)
 
+PKG_CHECK_MODULES(ORBIT, [
+       ORBit-2.0
+])
+AC_SUBST(ORBIT_LIBS)
+AC_SUBST(ORBIT_CFLAGS)
+
 dnl orbit-idl.
 ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
 AC_SUBST(ORBIT_IDL)

diff --git a/cspi/Makefile.am b/cspi/Makefile.am
index b9907c2..1e02d75 100644 (file)
--- a/cspi/Makefile.am
+++ b/cspi/Makefile.am
@@ -10,10 +10,10 @@ INCLUDES = -I $(top_srcdir)           \
            $(WARN_CFLAGS)                \
            $(LIBCSPI_CFLAGS)
 
-libcspi_la_LDFLAGS = @LDFLAGS@ ../libspi/libspi.la $(LIBCSPI_LIBS) @LT_VERSION_INFO@ @LIBTOOL_EXPORT_OPTIONS@
+libcspi_la_LDFLAGS = @LDFLAGS@ @LT_VERSION_INFO@ @LIBTOOL_EXPORT_OPTIONS@ -no-undefined
 
 LDADD =                                \
-       $(top_srcdir)/libspi/libspi.la  \
+       $(top_builddir)/libspi/libspi.la        \
        $(LIBCSPI_LIBS) $(X_LIBS)
 
 libcspidir = $(includedir)/at-spi-1.0/cspi
@@ -45,4 +45,6 @@ libcspi_la_SOURCES =          \
        spi_value.c
 
 libcspi_la_LIBADD =            \
-       bonobo/libcspi-bonobo.la
+       bonobo/libcspi-bonobo.la        \
+       $(top_builddir)/libspi/libspi.la \
+       $(LIBCSPI_LIBS) $(X_LIBS)

diff --git a/libspi/Makefile.am b/libspi/Makefile.am
index e5364f3..1dad2cd 100644 (file)
--- a/libspi/Makefile.am
+++ b/libspi/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)      \
            $(WARN_CFLAGS)      \
            $(LIBSPI_CFLAGS)
 
-libspi_la_LDFLAGS = @LT_VERSION_INFO@
+libspi_la_LDFLAGS = @LT_VERSION_INFO@ -no-undefined
 libspi_la_LIBADD = $(LIBSPI_LIBS) $(XTST_LIBS)
 
 libspiincludedir = $(includedir)/at-spi-1.0/libspi
@@ -106,7 +106,11 @@ orbittypelibdir = $(libdir)/orbit-2.0
 orbittypelib_LTLIBRARIES = Accessibility_module.la
 
 Accessibility_module_la_LDFLAGS = \
-       -export-dynamic -module -avoid-version
+       -export-dynamic -module -avoid-version -no-undefined
+
+Accessibility_module_la_LIBADD = \
+       $(ORBIT_LIBS)
+
 Accessibility_module_la_SOURCES = \
        Accessibility-imodule.c
 

diff --git a/login-helper/Makefile.am b/login-helper/Makefile.am
index e9f5c86..10bd304 100644 (file)
--- a/login-helper/Makefile.am
+++ b/login-helper/Makefile.am
@@ -4,6 +4,7 @@ LDADD = $(X_LIBS) $(LOGIN_HELPER_LIBS)
 
 INCLUDES = -I$(top_srcdir)          \
            -I$(top_builddir)        \
+          $(WARN_CFLAGS)       \
            $(REGISTRYD_CFLAGS)
 
 IDL_OUT = Accessibility_LoginHelper.h Accessibility_LoginHelper-stubs.c Accessibility_LoginHelper-skels.c Accessibility_LoginHelper-common.c
@@ -16,6 +17,9 @@ CLEANFILES = $(IDL_OUT) Accessibility_LoginHelper-imodule.c
 
 libloginhelperincludedir = $(includedir)/at-spi-1.0/login-helper
 
+libloginhelper_la_LDFLAGS = -no-undefined
+libloginhelper_la_LIBADD = $(REGISTRYD_LIBS)
+
 libloginhelperinclude_HEADERS = \
        Accessibility_LoginHelper.h     \
        login-helper.h                  
@@ -36,7 +40,9 @@ orbittypelibdir = $(libdir)/orbit-2.0
 orbittypelib_LTLIBRARIES = Accessibility_LoginHelper_module.la
 
 Accessibility_LoginHelper_module_la_LDFLAGS = \
-       -export-dynamic -module -avoid-version
+       -export-dynamic -module -avoid-version -no-undefined
+Accessibility_LoginHelper_module_la_LIBADD = \
+       $(ORBIT_LIBS)
 Accessibility_LoginHelper_module_la_SOURCES = \
        Accessibility_LoginHelper-imodule.c