diff options
| author | Padraig O'Briain <padraig.obriain@sun.com> | 2004-03-22 10:33:23 +0000 |
|---|---|---|
| committer | Padraig O'Briain <padraigo@src.gnome.org> | 2004-03-22 10:33:23 +0000 |
| commit | 44844952cea11c96590ecb812cb89d1f2bb4798b (patch) | |
| tree | 796c0c53ea85dbce4658db260a49b59f4d3c94e1 | |
| parent | e23a0f0aeeb37bc8abdb419e8f06894d245ccc91 (diff) | |
| download | atk-gnome-2-2.tar.gz | |
Update to build on Cygwin. Fixes bug #137665. Patch from Roger Leigh.gnome-2-2
2004-03-22 Padraig O'Briain <padraig.obriain@sun.com>
* configure.in:
* atk/Makefile.am: Update to build on Cygwin. Fixes bug #137665.
Patch from Roger Leigh.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | atk/Makefile.am | 21 | ||||
| -rw-r--r-- | configure.in | 14 |
3 files changed, 29 insertions, 12 deletions
@@ -1,3 +1,9 @@ +2004-03-22 Padraig O'Briain <padraig.obriain@sun.com> + + * configure.in: + * atk/Makefile.am: Update to build on Cygwin. Fixes bug #137665. + Patch from Roger Leigh. + 2003-06-15 Arafat Medini <lumina@silverpen.de> * configure.in: Added locale "ar" Arabic to ALL_LINGUAS. diff --git a/atk/Makefile.am b/atk/Makefile.am index 5ce077d..ed84cf2 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -3,19 +3,19 @@ GPATH = $(srcdir) EXTRA_DIST = atk.def atk.rc.in -if OS_WIN32 + +if PLATFORM_WIN32 export_symbols = -export-symbols atk.def no_undefined = -no-undefined +endif +if OS_WIN32 libatk_1_0_la_LIBADD += atk-win32res.lo install-libtool-import-lib: $(INSTALL) .libs/libatk-$(ATK_API_VERSION).dll.a $(DESTDIR)$(libdir) uninstall-libtool-import-lib: -rm $(DESTDIR)$(libdir)/libatk-$(ATK_API_VERSION).dll.a -else -install-libtool-import-lib: -uninstall-libtool-import-lib: endif atk-win32res.lo: atk.rc @@ -31,9 +31,6 @@ install-ms-lib: uninstall-ms-lib: -rm $(DESTDIR)$(libdir)/atk-$(ATK_API_VERSION).lib -else -install-ms-lib: -uninstall-ms-lib: endif atk_built_headers = atk-enum-types.h @@ -70,7 +67,7 @@ libatk_1_0_la_SOURCES = \ EXTRA_DIST += atkmarshal.list \ atkintl.h -MAINTAINERCLEANFILES += \ +MAINTAINERCLEANFILES = \ atkmarshal.c \ atkmarshal.h \ stamp-atkmarshal.c \ @@ -82,10 +79,10 @@ INCLUDES = \ @DEP_CFLAGS@ \ -DATKLOCALEDIR=\""$(atklocaledir)"\" -LDFLAGS = \ +AM_LDFLAGS = \ -version-info $(LT_VERSION_INFO) \ $(export_symbols) \ - $(no_undefined) \ + -no-undefined \ @DEP_LIBS@ libatkincludedir=$(includedir)/atk-1.0/atk @@ -176,10 +173,12 @@ s-enum-types-c: @REBUILD@ $(atk_headers) Makefile && rm -f tmp-atk-enum-types.c \ && echo timestamp > $(@F) - +# This doesn't want doing when building Cygwin DLLs +if OS_WIN32 atk-$(ATK_API_VERSION).lib: libatk-$(ATK_API_VERSION).la atk.def lib -name:libatk-$(ATK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:atk.def -out:$@ install-data-local: install-ms-lib install-libtool-import-lib uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib +endif diff --git a/configure.in b/configure.in index fdf808b..15fdd3d 100644 --- a/configure.in +++ b/configure.in @@ -84,7 +84,19 @@ AM_DISABLE_STATIC AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL -AC_MSG_CHECKING([for Win32]) +AC_MSG_CHECKING([for some Win32 platform]) +case "$host" in + *-*-mingw*|*-*-cygwin*) + platform_win32=yes + ;; + *) + platform_win32=no + ;; +esac +AC_MSG_RESULT([$platform_win32]) +AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes") + +AC_MSG_CHECKING([for native Win32 platform]) case "$host" in *-*-mingw*) atk_native_win32=yes |