diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
| commit | d6f64084b9bc07d0bdd527f9354f2d1d962ed16d (patch) | |
| tree | 81b2652d421992fd63143a04885e332e83e18d07 /fontconfig/src/Makefile.am | |
| parent | 669b562a737c9418c53bfae69c0dbf1aabe318b4 (diff) | |
| parent | 7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb (diff) | |
| download | vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.gz vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.bz2 vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
fontconfig/src/fcint.h
fontconfig/src/fcstat.c
mesalib/src/mapi/glapi/gen/GL3x.xml
xorg-server/glx/glxext.h
Diffstat (limited to 'fontconfig/src/Makefile.am')
| -rw-r--r-- | fontconfig/src/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fontconfig/src/Makefile.am b/fontconfig/src/Makefile.am index 65ec1e3bb..3dd69dde9 100644 --- a/fontconfig/src/Makefile.am +++ b/fontconfig/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 \ |