diff options
Diffstat (limited to 'Build/source/libs/freetype2')
| -rw-r--r-- | Build/source/libs/freetype2/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/libs/freetype2/Makefile.am | 22 | ||||
| -rw-r--r-- | Build/source/libs/freetype2/Makefile.in | 20 |
3 files changed, 20 insertions, 26 deletions
diff --git a/Build/source/libs/freetype2/ChangeLog b/Build/source/libs/freetype2/ChangeLog index ee53338cd77..5c74dd5a849 100644 --- a/Build/source/libs/freetype2/ChangeLog +++ b/Build/source/libs/freetype2/ChangeLog @@ -1,3 +1,7 @@ +2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Better dependencies for parallel build. + 2012-05-15 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Use $(SHELL) for sub-configure. diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am index 5fb9ba4cad8..6f660a049b5 100644 --- a/Build/source/libs/freetype2/Makefile.am +++ b/Build/source/libs/freetype2/Makefile.am @@ -14,8 +14,6 @@ rebuild: all ## We want to re-distribute the whole original FreeType source tree. ## -## With current automake (1.10.2) 'make distcheck' fails when -## DISTFILES contains a directory and files in that directory. EXTRA_DIST = $(FREETYPE_TREE) ## Changes applied to the original source tree @@ -28,7 +26,12 @@ dist-hook: noinst_DATA = libfreetype.a -ft-build/Makefile: +# On MacOSX, using our zlib from TL results in a .a that is unusable; ld +# warns "file is not of required architecture", and does not read it. +# There is no apparent reason for this. Using --without-zlib evidently +# causes freetype2 to use its internal zlib, so no functionality should +# be lost, even though it is not the cleanest solution. +ft-config: rm -rf ft-build $(MKDIR_P) ft-build cd ft-build && \ @@ -41,24 +44,15 @@ ft-build/Makefile: --prefix=$(abs_builddir)/ft-install \ --libdir=$(abs_builddir) \ --includedir=$(abs_builddir) + echo timestamp >ft-config -# On MacOSX, using our zlib from TL results in a .a that is unusable; ld -# warns "file is not of required architecture", and does not read it. -# There is no apparent reason for this. Using --without-zlib evidently -# causes freetype2 to use its internal zlib, so no functionality should -# be lost, even though it is not the cleanest solution. -# --with-zlib $(ZLIB_FLAGS_FOR_FREETYPE) \ -# # Unfortunately the FreeType build system installs the headers after the library; # to get our dependencies right we wait for a second and then touch the library. -libfreetype.a: ft-build/Makefile $(ZLIB_DEPEND) +libfreetype.a: ft-config rm -rf ft-install cd ft-build \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) install - ft-install/bin/freetype-config --cflags >ft-includes - ft-install/bin/freetype-config --libs \ - | sed -e 's,-L\(.*\) -lfreetype,\1/libfreetype.la,' >ft-libs sleep 1 @for f in libfreetype.*; do touch $$f; done diff --git a/Build/source/libs/freetype2/Makefile.in b/Build/source/libs/freetype2/Makefile.in index f34d4c55700..2d24b5205ce 100644 --- a/Build/source/libs/freetype2/Makefile.in +++ b/Build/source/libs/freetype2/Makefile.in @@ -512,7 +512,12 @@ rebuild: all dist-hook: rm -rf `find $(distdir) -name .svn` -ft-build/Makefile: +# On MacOSX, using our zlib from TL results in a .a that is unusable; ld +# warns "file is not of required architecture", and does not read it. +# There is no apparent reason for this. Using --without-zlib evidently +# causes freetype2 to use its internal zlib, so no functionality should +# be lost, even though it is not the cleanest solution. +ft-config: rm -rf ft-build $(MKDIR_P) ft-build cd ft-build && \ @@ -525,24 +530,15 @@ ft-build/Makefile: --prefix=$(abs_builddir)/ft-install \ --libdir=$(abs_builddir) \ --includedir=$(abs_builddir) + echo timestamp >ft-config -# On MacOSX, using our zlib from TL results in a .a that is unusable; ld -# warns "file is not of required architecture", and does not read it. -# There is no apparent reason for this. Using --without-zlib evidently -# causes freetype2 to use its internal zlib, so no functionality should -# be lost, even though it is not the cleanest solution. -# --with-zlib $(ZLIB_FLAGS_FOR_FREETYPE) \ -# # Unfortunately the FreeType build system installs the headers after the library; # to get our dependencies right we wait for a second and then touch the library. -libfreetype.a: ft-build/Makefile $(ZLIB_DEPEND) +libfreetype.a: ft-config rm -rf ft-install cd ft-build \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) install - ft-install/bin/freetype-config --cflags >ft-includes - ft-install/bin/freetype-config --libs \ - | sed -e 's,-L\(.*\) -lfreetype,\1/libfreetype.la,' >ft-libs sleep 1 @for f in libfreetype.*; do touch $$f; done |