libtool installs/uninstalls the import library, no need to do it

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

diff --git a/glib/Makefile.am b/glib/Makefile.am
index bae30d3..ad051b0 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -14,16 +14,21 @@ INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=\"GLib\" \
        $(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION 
 
 glib.def: glib.symbols
-       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/    /' -e 's/G_GNUC_[^ ]*//g') > glib.def
+       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/        /' -e 's/G_GNUC_[^ ]*//g') > glib.def
 
 galias.h: glib.symbols
          $(PERL) $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h
 
+galiasdef.c: glib.symbols
+         $(PERL) $(srcdir)/makegalias.pl -def < $(srcdir)/glib.symbols > galiasdef.c
+
 if OS_LINUX
+if HAVE_GNUC_VISIBILITY
 TESTS = abicheck.sh
 endif
+endif
 
-BUILT_SOURCES = galias.h
+BUILT_SOURCES = galias.h galiasdef.c
 
 EXTRA_DIST =                   \
        makefile.msc.in         \
@@ -37,8 +42,8 @@ EXTRA_DIST =                  \
 BUILT_EXTRA_DIST =             \
        makefile.msc            \
        glib.rc                 \
-       glib.def                \
-       galias.h
+       galias.h                \
+       galiasdef.c
 
 lib_LTLIBRARIES = libglib-2.0.la
 
@@ -65,6 +70,7 @@ libglib_2_0_la_SOURCES =      \
        gcompletion.c           \
        gconvert.c              \
        gdataset.c              \
+       gdatasetprivate.h       \
        gdate.c                 \
        gdir.c                  \
        gerror.c                \
@@ -76,6 +82,7 @@ libglib_2_0_la_SOURCES =      \
        glibintl.h              \
        glist.c                 \
        gmain.c                 \
+       gmappedfile.c           \
        gmarkup.c               \
        gmem.c                  \
        gmessages.c             \
@@ -149,6 +156,7 @@ glibsubinclude_HEADERS =   \
        glist.h         \
        gmacros.h       \
        gmain.h         \
+       gmappedfile.h   \
        gmarkup.h       \
        gmem.h          \
        gmessages.h     \
@@ -178,14 +186,14 @@ glibsubinclude_HEADERS =   \
        gwin32.h        \
        gprintf.h
 
-install-data-local: install-ms-lib install-libtool-import-lib
+install-data-local: install-ms-lib install-def-file
        @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
+uninstall-local: uninstall-ms-lib uninstall-def-file
 
 if PLATFORM_WIN32
 no_undefined = -no-undefined
@@ -193,25 +201,16 @@ endif
 
 if OS_WIN32
 # This requires a very new libtool
-export_symbols = -export-symbols $(srcdir)/glib.def
-
-install-libtool-import-lib:
-#      Don't put the binary compatibility entries in the import lib!
-#      (Unfortunately the GNU linker doesn't yet understand the PRIVATE
-#      directive in .def files.)
-#
-       for entry in `grep PRIVATE glib.def | sed -e 's/PRIVATE//'`; do \
-         file=`nm -A .libs/libglib-2.0.dll.a | tr -d '\r' | grep -m 1 -E $$entry'$$' | cut -d: -f2`; \
-         ar d .libs/libglib-2.0.dll.a $$file; \
-       done
-       $(INSTALL) .libs/libglib-2.0.dll.a $(DESTDIR)$(libdir)
-       $(INSTALL) $(srcdir)/glib.def $(DESTDIR)$(libdir)/glib-2.0.def
-
-uninstall-libtool-import-lib:
-       -rm $(DESTDIR)$(libdir)/libglib-2.0.dll.a $(DESTDIR)$(libdir)/glib-2.0.def
+export_symbols = -export-symbols glib.def
+
+install-def-file:
+       $(INSTALL) glib.def $(DESTDIR)$(libdir)/glib-2.0.def
+
+uninstall-def-file:
+       -rm $(DESTDIR)$(libdir)/glib-2.0.def
 else
-install-libtool-import-lib:
-uninstall-libtool-import-lib:
+install-def-file:
+uninstall-def-file:
 
 export_symbols = $(LIBTOOL_EXPORT_OPTIONS)
 endif