* builds/unix/configure.ac: fixed build problem on Cygwin
* builds/unix/install.mk: the installation now avoids installing the internal headers, and removes existing ones if finds in the target install directory
This commit is contained in:
parent
be3c9814a4
commit
7213b4febd
14
ChangeLog
14
ChangeLog
|
@ -1,7 +1,17 @@
|
||||||
2006-01-27 David Turner <david@freetype.org>
|
2006-01-27 David Turner <david@freetype.org>
|
||||||
|
|
||||||
* src/autofit/afwarp.c: Simple #ifdef to prevent compilation when
|
* builds/unix/configure.ac: fixed build problem on Cygwin
|
||||||
the warp hinter isn't active (it shouldn't, still experimental).
|
|
||||||
|
* builds/unix/install.mk: the installation now avoids installing
|
||||||
|
the internal headers, and removes existing ones if finds in the
|
||||||
|
target install directory
|
||||||
|
|
||||||
|
* src/psaux/afmparse.h, src/psaux/afmparse.c: getting rid of
|
||||||
|
writable static variables (i.e. the string table), and fixed
|
||||||
|
the compilation in FT2_MULTI mode
|
||||||
|
|
||||||
|
* src/autofit/afwarp.c: simple #ifdef to prevent compilation when
|
||||||
|
the warp hinter isn't active (it shouldn't, still experimental)
|
||||||
|
|
||||||
* Jamfile, include/freetype/config/ftmodule.h: Removed `gxvalid'
|
* Jamfile, include/freetype/config/ftmodule.h: Removed `gxvalid'
|
||||||
and `otvalid' from the list of modules that are linked statically
|
and `otvalid' from the list of modules that are linked statically
|
||||||
|
|
|
@ -23,11 +23,14 @@
|
||||||
.PHONY: install uninstall check
|
.PHONY: install uninstall check
|
||||||
|
|
||||||
# Unix installation and deinstallation targets.
|
# Unix installation and deinstallation targets.
|
||||||
|
#
|
||||||
|
# note that we don't install internal headers since 2.2.0, and
|
||||||
|
# we remove any 'internal' directory found in $(includedir)/freetype2/freetype
|
||||||
|
#
|
||||||
install: $(PROJECT_LIBRARY)
|
install: $(PROJECT_LIBRARY)
|
||||||
$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
||||||
$(DESTDIR)$(libdir)/pkgconfig \
|
$(DESTDIR)$(libdir)/pkgconfig \
|
||||||
$(DESTDIR)$(includedir)/freetype2/freetype/config \
|
$(DESTDIR)$(includedir)/freetype2/freetype/config \
|
||||||
$(DESTDIR)$(includedir)/freetype2/freetype/internal \
|
|
||||||
$(DESTDIR)$(includedir)/freetype2/freetype/cache \
|
$(DESTDIR)$(includedir)/freetype2/freetype/cache \
|
||||||
$(DESTDIR)$(bindir) \
|
$(DESTDIR)$(bindir) \
|
||||||
$(DESTDIR)$(datadir)/aclocal
|
$(DESTDIR)$(datadir)/aclocal
|
||||||
|
@ -37,10 +40,6 @@ install: $(PROJECT_LIBRARY)
|
||||||
$(INSTALL_DATA) \
|
$(INSTALL_DATA) \
|
||||||
$$P $(DESTDIR)$(includedir)/freetype2/freetype ; \
|
$$P $(DESTDIR)$(includedir)/freetype2/freetype ; \
|
||||||
done
|
done
|
||||||
-for P in $(BASE_H) ; do \
|
|
||||||
$(INSTALL_DATA) \
|
|
||||||
$$P $(DESTDIR)$(includedir)/freetype2/freetype/internal ; \
|
|
||||||
done
|
|
||||||
-for P in $(CONFIG_H) ; do \
|
-for P in $(CONFIG_H) ; do \
|
||||||
$(INSTALL_DATA) \
|
$(INSTALL_DATA) \
|
||||||
$$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \
|
$$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \
|
||||||
|
@ -49,6 +48,8 @@ install: $(PROJECT_LIBRARY)
|
||||||
$(INSTALL_DATA) \
|
$(INSTALL_DATA) \
|
||||||
$$P $(DESTDIR)$(includedir)/freetype2/freetype/cache ; \
|
$$P $(DESTDIR)$(includedir)/freetype2/freetype/cache ; \
|
||||||
done
|
done
|
||||||
|
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/internal/*
|
||||||
|
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/internal
|
||||||
$(INSTALL_DATA) $(BUILD_DIR)/ft2unix.h \
|
$(INSTALL_DATA) $(BUILD_DIR)/ft2unix.h \
|
||||||
$(DESTDIR)$(includedir)/ft2build.h
|
$(DESTDIR)$(includedir)/ft2build.h
|
||||||
$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \
|
$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \
|
||||||
|
@ -67,8 +68,6 @@ uninstall:
|
||||||
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/cache
|
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/cache
|
||||||
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/*
|
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/*
|
||||||
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config
|
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config
|
||||||
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/internal/*
|
|
||||||
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/internal
|
|
||||||
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/*
|
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/*
|
||||||
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
|
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
|
||||||
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2
|
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2
|
||||||
|
|
Loading…
Reference in New Issue