.gitignore | 1 +
configure.in | 1 +
src/Makefile.am | 2 ++
3 files changed, 4 insertions(+)
New commits:
commit 997a64a67b77ae7c083f4a2898670201ed618fb2
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Thu Jun 14 11:27:31 2012 +0900
Fix the fail of make install with --disable-shared on Win32
diff --git a/.gitignore b/.gitignore
index 894a6a7..32b9e43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
tags
TAGS
+*.exe
*.tar.gz
.libs
.deps
diff --git a/configure.in b/configure.in
index c06ad89..a8c1f87 100644
--- a/configure.in
+++ b/configure.in
@@ -104,6 +104,7 @@ AC_SUBST(WARN_CFLAGS)
dnl ==========================================================================
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+AM_CONDITIONAL(ENABLE_SHARED, test "$enable_shared" = "yes")
dnl ==========================================================================
diff --git a/src/Makefile.am b/src/Makefile.am
index 65ec1e3..3dd69dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -134,9 +134,11 @@ libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT
libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency)
+if ENABLE_SHARED
install-data-local: install-ms-import-lib install-libtool-import-lib
uninstall-local: uninstall-ms-import-lib uninstall-libtool-import-lib
+endif
PUBLIC_FILES = \
$(top_srcdir)/fontconfig/fontconfig.h \
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/fontconfig
