Commit 7213b4febd8c92de5ff035d29be7d37a430b0a02
2006-01-27T16:42:32
* 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
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
diff --git a/ChangeLog b/ChangeLog
index a20e8b1..5d2ec44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,17 @@
2006-01-27 David Turner <david@freetype.org>
- * src/autofit/afwarp.c: Simple #ifdef to prevent compilation when
- the warp hinter isn't active (it shouldn't, still experimental).
+ * 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
+
+ * 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'
and `otvalid' from the list of modules that are linked statically
diff --git a/builds/unix/install.mk b/builds/unix/install.mk
index 815817d..54cfd74 100644
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@@ -23,11 +23,14 @@
.PHONY: install uninstall check
# 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)
$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(libdir)/pkgconfig \
$(DESTDIR)$(includedir)/freetype2/freetype/config \
- $(DESTDIR)$(includedir)/freetype2/freetype/internal \
$(DESTDIR)$(includedir)/freetype2/freetype/cache \
$(DESTDIR)$(bindir) \
$(DESTDIR)$(datadir)/aclocal
@@ -37,10 +40,6 @@ install: $(PROJECT_LIBRARY)
$(INSTALL_DATA) \
$$P $(DESTDIR)$(includedir)/freetype2/freetype ; \
done
- -for P in $(BASE_H) ; do \
- $(INSTALL_DATA) \
- $$P $(DESTDIR)$(includedir)/freetype2/freetype/internal ; \
- done
-for P in $(CONFIG_H) ; do \
$(INSTALL_DATA) \
$$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \
@@ -49,6 +48,8 @@ install: $(PROJECT_LIBRARY)
$(INSTALL_DATA) \
$$P $(DESTDIR)$(includedir)/freetype2/freetype/cache ; \
done
+ -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/internal/*
+ -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/internal
$(INSTALL_DATA) $(BUILD_DIR)/ft2unix.h \
$(DESTDIR)$(includedir)/ft2build.h
$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \
@@ -67,8 +68,6 @@ uninstall:
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/cache
-$(DELETE) $(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/*
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2