walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the fail of make install with --disable-shared on Win32

This commit is contained in:
Akira TAGOH 2012-06-14 11:27:31 +09:00
parent cd280f6532
commit 997a64a67b
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
tags tags
TAGS TAGS
*.exe
*.tar.gz *.tar.gz
.libs .libs
.deps .deps

1
configure.in
View File

@ -104,6 +104,7 @@ AC_SUBST(WARN_CFLAGS)
dnl ========================================================================== dnl ==========================================================================
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
AM_CONDITIONAL(ENABLE_SHARED, test "$enable_shared" = "yes")
dnl ========================================================================== dnl ==========================================================================

2
src/Makefile.am
View File

@ -134,9 +134,11 @@ libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT
libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency) libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency)
if ENABLE_SHARED
install-data-local: install-ms-import-lib install-libtool-import-lib install-data-local: install-ms-import-lib install-libtool-import-lib
uninstall-local: uninstall-ms-import-lib uninstall-libtool-import-lib uninstall-local: uninstall-ms-import-lib uninstall-libtool-import-lib
endif
PUBLIC_FILES = \ PUBLIC_FILES = \
$(top_srcdir)/fontconfig/fontconfig.h \ $(top_srcdir)/fontconfig/fontconfig.h \