Use -mwindows.

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

diff --git a/glib/Makefile.am b/glib/Makefile.am
index c09f097..d5b627f 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+SUBDIRS=libcharset
+
 INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=g_log_domain_glib \
        @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION 
 
@@ -17,6 +19,15 @@ lib_LTLIBRARIES = libglib-1.3.la
 
 if MS_LIB_AVAILABLE
 noinst_DATA = glib-1.3.lib
+
+install-ms-lib:
+       $(INSTALL) glib-1.3.lib $(DESTDIR)$(libdir)
+
+uninstall-ms-lib:
+       -rm $(DESTDIR)$(libdir)/glib-1.3.lib
+else
+install-ms-lib:
+uninstall-ms-lib:
 endif
 
 libglib_1_3_la_SOURCES =       \
@@ -30,6 +41,7 @@ libglib_1_3_la_SOURCES =      \
        gconvert.c              \
        gdataset.c              \
        gdate.c                 \
+       gdir.c                  \
        gerror.c                \
        gfileutils.c            \
        ghash.c                 \
@@ -91,6 +103,7 @@ glibsubinclude_HEADERS =   \
        gconvert.h      \
        gdataset.h      \
        gdate.h         \
+       gdir.h          \
        gerror.h        \
        gfileutils.h    \
        ghash.h         \
@@ -125,24 +138,34 @@ glibsubinclude_HEADERS =   \
        gutils.h        \
        gwin32.h
 
-install-data-local:
+install-data-local: install-ms-lib install-libtool-import-lib
        @if test -f $(glibincludedir)/glist.h ; then                                    \
          echo "*** Old headers found in $(glibincludedir). You should remove the" ;    \
          echo "*** contents of this directory and type 'make install' again." ;        \
          false ;                                                                       \
         fi
 
+uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+
 if PLATFORM_WIN32
 no_undefined = -no-undefined
-
 endif
+
 if OS_WIN32
 # This requires a very new libtool
 export_symbols = -export-symbols glib.def
+
+install-libtool-import-lib:
+       $(INSTALL) .libs/libglib-1.3.dll.a $(DESTDIR)$(libdir)
+uninstall-libtool-import-lib:
+       -rm $(DESTDIR)$(libdir)/libglib-1.3.dll.a
+else
+install-libtool-import-lib:
+uninstall-libtool-import-lib:
 endif
 
-libglib_1_3_la_LIBADD = @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @ICONV_LIBS@ @G_LIBS_EXTRA@ 
-libglib_1_3_la_DEPENDENCIES = @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @GLIB_DEF@
+libglib_1_3_la_LIBADD = libcharset/libcharset.la @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @ICONV_LIBS@ @G_LIBS_EXTRA@ 
+libglib_1_3_la_DEPENDENCIES = libcharset/libcharset.la @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @GLIB_DEF@
 
 libglib_1_3_la_LDFLAGS = \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
@@ -151,6 +174,7 @@ libglib_1_3_la_LDFLAGS = \
 if OS_WIN32
 bin_PROGRAMS = gspawn-win32-helper
 gspawn_win32_helper_LDADD = libglib-1.3.la
+gspawn_win32_helper_LDFLAGS = -mwindows
 
 @G_LIB_WIN32_RESOURCE@ : glib.rc
        $(top_srcdir)/build/win32/lt-compile-resource glib.rc @G_LIB_WIN32_RESOURCE@