Commit 392cf22f authored by Werner Lemberg's avatar Werner Lemberg
Browse files

Another adjustment to header locations.

This change is a result of a discussion thread on freetype-devel

  http://lists.nongnu.org/archive/html/freetype-devel/2015-06/msg00041.html

Re-introduce the `freetype2' subdirectory for all FreeType header
files after installation, and rename the `freetype2' subdirectory in
the git repository to `freetype'.

* include/freetype2: Renamed to...
* include/freetype: This.

* CMakeLists.txt (PUBLIC_HEADERS, PUBLIC_CONFIG_HEADERS,
PRIVATE_HEADERS): Updated.
Update creation of `ftconfig.h'.
Install generated `ftconfig.h'.

* Jamfile (HDRMACRO, RefDoc), autogen.sh: Updated.

* builds/amiga/include/config/ftconfig.h, builds/freetype.mk
(PUBLIC_DIR), builds/symbian/bld.inf, builds/toplevel.mk (work),
builds/unix/freetype2.in: Updated.

* builds/unix/freetype-config.in: Updated.
* builds/unix/configure.raw: Don't check for `rmdir'.
* builds/unix/unix-def.in (DELDIR): Use `rm -rf', which is portable
according to the autoconf info manual.
* builds/unix/install.mk (install, uninstall,
distclean_project_unix): Update and simplify.

* builds/wince/*, builds/windows/*: Updated.

* devel/ft2build.h, include/ft2build.h: Updated.

* include/freetype2/config/ftheader.h,
include/freetype2/internal/ftserv.h,
include/freetype2/internal/internal.h: Update all header file
macros.

* src/tools/chktrcmp.py (TRACE_DEF_FILES): Updated.

* docs/*: Updated.
parent 41bfbadc
......@@ -11,42 +11,48 @@
# indicate that you have read the license and understand and accept it
# fully.
#
# As a preliminary, create a compilation directory and change into it, for
# example
#
# Say
# mkdir ~/freetype2.compiled
# cd ~/freetype2.compiled
#
# cmake CMakeLists.txt
# Now you can say
#
# cmake <path-to-freetype2-src-dir>
#
# to create a Makefile that builds a static version of the library.
#
# For a dynamic library, use
#
# cmake CMakeLists.txt -DBUILD_SHARED_LIBS:BOOL=true
# cmake <path-to-freetype2-src-dir> -DBUILD_SHARED_LIBS:BOOL=true
#
# For a framework on OS X, use
#
# cmake CMakeLists.txt -DBUILD_FRAMEWORK:BOOL=true -G Xcode
# cmake <path-to-freetype2-src-dir> -DBUILD_FRAMEWORK:BOOL=true -G Xcode
#
# instead.
#
# For an iOS static library, use
#
# cmake CMakeLists.txt -DIOS_PLATFORM=OS -G Xcode
# cmake <path-to-freetype2-src-dir> -DIOS_PLATFORM=OS -G Xcode
#
# or
#
# cmake CMakeLists.txt -DIOS_PLATFORM=SIMULATOR -G Xcode
# cmake <path-to-freetype2-src-dir> -DIOS_PLATFORM=SIMULATOR -G Xcode
#
# Please refer to the cmake manual for further options, in particular, how
# to modify compilation and linking parameters.
#
# Some notes.
#
# . `cmake' will overwrite FreeType's original (top-level) `Makefile' file.
# . `cmake' will overwrite some files in the source tree in case you don't
# call it from a build directory as described above.
#
# . You can use `cmake' directly on a freshly cloned FreeType git
# repository.
#
# . `CMakeLists.txt' is provided as-is since it is not used by the
# . `CMakeLists.txt' is provided as-is since it is not used by the
# developer team.
......@@ -109,21 +115,21 @@ add_definitions(-DFT2_BUILD_LIBRARY)
include_directories("${PROJECT_SOURCE_DIR}/include")
# Create the configuration file
message(STATUS "Creating directory, ${PROJECT_BINARY_DIR}/include/freetype2.")
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include/freetype2)
message(STATUS "Creating directory, ${PROJECT_BINARY_DIR}/include/freetype/config.")
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include/freetype/config)
# For the auto-generated ftconfig.h file
include_directories(BEFORE "${PROJECT_BINARY_DIR}/include/freetype2")
message(STATUS "Creating ${PROJECT_BINARY_DIR}/include/freetype2/ftconfig.h.")
include_directories(BEFORE "${PROJECT_BINARY_DIR}/include/freetype/config")
message(STATUS "Creating ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h.")
execute_process(
COMMAND sed -e "s/FT_CONFIG_OPTIONS_H/<ftoption.h>/" -e "s/FT_CONFIG_STANDARD_LIBRARY_H/<ftstdlib.h>/" -e "s?/undef ?#undef ?"
INPUT_FILE ${PROJECT_SOURCE_DIR}/builds/unix/ftconfig.in
OUTPUT_FILE ${PROJECT_BINARY_DIR}/include/freetype2/ftconfig.h
OUTPUT_FILE ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h
)
file(GLOB PUBLIC_HEADERS "include/freetype2/*.h")
file(GLOB PUBLIC_CONFIG_HEADERS "include/freetype2/config/*.h")
file(GLOB PRIVATE_HEADERS "include/freetype2/internal/*.h")
file(GLOB PUBLIC_HEADERS "include/ft2build.h" "include/freetype/*.h")
file(GLOB PUBLIC_CONFIG_HEADERS "include/freetype/config/*.h")
file(GLOB PRIVATE_HEADERS "include/freetype/internal/*.h")
set(BASE_SRCS
src/autofit/autofit.c
......@@ -219,6 +225,10 @@ endif ()
install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
DESTINATION include/freetype2
PATTERN "internal" EXCLUDE
PATTERN "ftconfig.h" EXCLUDE
)
install(FILES ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h
DESTINATION include/freetype2/freetype/config
)
install(TARGETS freetype
RUNTIME DESTINATION bin
......
......@@ -6,6 +6,52 @@
* src/bdf/bdflib.c (_bdf_parse_start): Simplify bpp parsing.
2015-06-25 Werner Lemberg <wl@gnu.org>
Another adjustment to header locations.
This change is a result of a discussion thread on freetype-devel
http://lists.nongnu.org/archive/html/freetype-devel/2015-06/msg00041.html
Re-introduce the `freetype2' subdirectory for all FreeType header
files after installation, and rename the `freetype2' subdirectory in
the git repository to `freetype'.
* include/freetype2: Renamed to...
* include/freetype: This.
* CMakeLists.txt (PUBLIC_HEADERS, PUBLIC_CONFIG_HEADERS,
PRIVATE_HEADERS): Updated.
Update creation of `ftconfig.h'.
Install generated `ftconfig.h'.
* Jamfile (HDRMACRO, RefDoc), autogen.sh: Updated.
* builds/amiga/include/config/ftconfig.h, builds/freetype.mk
(PUBLIC_DIR), builds/symbian/bld.inf, builds/toplevel.mk (work),
builds/unix/freetype2.in: Updated.
* builds/unix/freetype-config.in: Updated.
* builds/unix/configure.raw: Don't check for `rmdir'.
* builds/unix/unix-def.in (DELDIR): Use `rm -rf', which is portable
according to the autoconf info manual.
* builds/unix/install.mk (install, uninstall,
distclean_project_unix): Update and simplify.
* builds/wince/*, builds/windows/*: Updated.
* devel/ft2build.h, include/ft2build.h: Updated.
* include/freetype2/config/ftheader.h,
include/freetype2/internal/ftserv.h,
include/freetype2/internal/internal.h: Update all header file
macros.
* src/tools/chktrcmp.py (TRACE_DEF_FILES): Updated.
* docs/*: Updated.
2015-06-23 Werner Lemberg <wl@gnu.org>
s/TYPEOF/FT_TYPEOF/ (#45376).
......
......@@ -143,9 +143,9 @@ CCFLAGS += -DFT2_BUILD_LIBRARY ;
# macros that are later used in #include statements. They need to be parsed
# in order to record these definitions.
#
HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) freetype2 config ftheader.h ] ;
HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) freetype2 internal internal.h ] ;
HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) freetype2 internal ftserv.h ] ;
HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) freetype config ftheader.h ] ;
HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) freetype internal internal.h ] ;
HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) freetype internal ftserv.h ] ;
# Now include the Jamfile in `freetype2/src', used to drive the compilation
......@@ -199,8 +199,8 @@ actions RefDoc
--prefix=ft2
--title=FreeType-2.6
--output=$(DOC_DIR)
$(FT2_INCLUDE)/freetype2/*.h
$(FT2_INCLUDE)/freetype2/config/*.h
$(FT2_INCLUDE)/freetype/*.h
$(FT2_INCLUDE)/freetype/config/*.h
}
RefDoc refdoc ;
......
......@@ -139,7 +139,7 @@ check_tool_version $LIBTOOLIZE libtoolize LIBTOOLIZE 2.2.4
check_tool_version $AUTOCONF autoconf AUTOCONF 2.62
# This sets freetype_major, freetype_minor, and freetype_patch.
eval `sed -nf version.sed include/freetype2/freetype.h`
eval `sed -nf version.sed include/freetype/freetype.h`
# We set freetype-patch to an empty value if it is zero.
if test "$freetype_patch" = ".0"; then
......
......@@ -51,7 +51,7 @@ directory. The results are:
- ftdebug.o, an object module containing the standard version of the
debugging code which uses vprintf() and exit() (not pure).
Debugging can be turned on in FT:include/freetype2/config/ftoption.h
Debugging can be turned on in FT:include/freetype/config/ftoption.h
and with FT_SetTraceLevel().
- ftdebugpure.o, an object module containing the pure version of the
......@@ -65,13 +65,13 @@ directory. The results are:
program, I decided to use a different scheme: You must #include
FT:src/base/ftinit.c in your sourcecode and specify with #define
statements which modules you need. See
include/freetype2/config/ftmodule.h.
include/freetype/config/ftmodule.h.
To use in your own programs:
- Insert the #define and #include statements from top of
include/freetype2/config/ftmodule.h in your source code and
include/freetype/config/ftmodule.h in your source code and
uncomment the #define statements for the FreeType2 modules you need.
- You can use either PARAMETERS=REGISTER or PARAMETERS=STACK for
......@@ -101,7 +101,7 @@ To adapt to other compilers:
useful for the src directory).
- An example of how to replace/workaround a problematic include file
is include/freetype2/config/ftconfig.h; it changes a #define that
is include/freetype/config/ftconfig.h; it changes a #define that
would prevent SAS/C from generating XDEF's where it should do that and
then includes the standard FreeType2 include file.
......
......@@ -34,9 +34,9 @@
/* Now include the original file */
#ifndef __MORPHOS__
#ifdef __SASC
#include "FT:include/freetype2/config/ftconfig.h"
#include "FT:include/freetype/config/ftconfig.h"
#else
#include "/FT/include/freetype2/config/ftconfig.h"
#include "/FT/include/freetype/config/ftconfig.h"
#endif
#else
/* We must define that, it seems that
......@@ -45,7 +45,7 @@
* binaries from http://www.morphos.de)
*/
#define _LIBC_LIMITS_H_
#include "/FT/include/freetype2/config/ftconfig.h"
#include "/FT/include/freetype/config/ftconfig.h"
#endif
/*
......
......@@ -43,7 +43,7 @@
#
# link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o
# (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or
# FT_DEBUG_LEVEL_TRACE in include/freetype2/config/ftoption.h).
# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
all: libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o
......
......@@ -40,7 +40,7 @@
#
# link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o
# (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or
# FT_DEBUG_LEVEL_TRACE in include/freetype2/config/ftoption.h).
# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
all: assign libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o
......
......@@ -40,7 +40,7 @@
#
# link your programs with ft2_680x0.lib and either ftsystem.o or ftsystempure.o
# (and either ftdebug.o or ftdebugpure.o if you enabled FT_DEBUG_LEVEL_ERROR or
# FT_DEBUG_LEVEL_TRACE in include/freetype2/config/ftoption.h).
# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftcid.o ftfntfmt.o ftfstype.o \
ftgasp.o ftglyph.o ftgxval.o ftlcdfil.o ftmm.o ftotval.o \
......
......@@ -176,8 +176,8 @@
/* the memory and stream components which are set to 7 and 5, */
/* respectively. */
/* */
/* See the file <include/freetype2/internal/fttrace.h> for details of */
/* the available toggle names. */
/* See the file `include/freetype/internal/fttrace.h' for details of the */
/* available toggle names. */
/* */
/* The level must be between 0 and 7; 0 means quiet (except for serious */
/* runtime errors), and 7 means _very_ verbose. */
......
......@@ -97,7 +97,7 @@ BASE_DIR := $(SRC_DIR)/base
# Other derived directories.
#
PUBLIC_DIR := $(TOP_DIR)/include/freetype2
PUBLIC_DIR := $(TOP_DIR)/include/freetype
INTERNAL_DIR := $(PUBLIC_DIR)/internal
SERVICES_DIR := $(INTERNAL_DIR)/services
CONFIG_DIR := $(PUBLIC_DIR)/config
......@@ -175,7 +175,7 @@ OBJECTS_LIST :=
# Define $(PUBLIC_H) as the list of all public header files located in
# `$(TOP_DIR)/include/freetype2'. $(INTERNAL_H), and $(CONFIG_H) are defined
# `$(TOP_DIR)/include/freetype'. $(INTERNAL_H), and $(CONFIG_H) are defined
# similarly.
#
# This is used to simplify the dependency rules -- if one of these files
......
......@@ -18,49 +18,49 @@ PRJ_MMPFILES
freetype.mmp
PRJ_EXPORTS
../../include/freetype2/ft2build.h
../../include/freetype2/config/ftconfig.h config/ftconfig.h
../../include/freetype2/config/ftheader.h config/ftheader.h
../../include/freetype2/config/ftmodule.h config/ftmodule.h
../../include/freetype2/config/ftoption.h config/ftoption.h
../../include/freetype2/config/ftstdlib.h config/ftstdlib.h
../../include/freetype2/freetype.h freetype.h
../../include/freetype2/ftbbox.h ftbbox.h
../../include/freetype2/ftbdf.h ftbdf.h
../../include/freetype2/ftbitmap.h ftbitmap.h
../../include/freetype2/ftcache.h ftcache.h
../../include/freetype2/ftcid.h ftcid.h
../../include/freetype2/fterrdef.h fterrdef.h
../../include/freetype2/fterrors.h fterrors.h
../../include/freetype2/ftfntfmt.h ftfntfmt.h
../../include/freetype2/ftgasp.h ftgasp.h
../../include/freetype2/ftglyph.h ftglyph.h
../../include/freetype2/ftgxval.h ftgxval.h
../../include/freetype2/ftgzip.h ftgzip.h
../../include/freetype2/ftbzip2.h ftbzip2.h
../../include/freetype2/ftimage.h ftimage.h
../../include/freetype2/ftincrem.h ftincrem.h
../../include/freetype2/ftlcdfil.h ftlcdfil.h
../../include/freetype2/ftlist.h ftlist.h
../../include/freetype2/ftlzw.h ftlzw.h
../../include/freetype2/ftmac.h ftmac.h
../../include/freetype2/ftmm.h ftmm.h
../../include/freetype2/ftmodapi.h ftmodapi.h
../../include/freetype2/ftmoderr.h ftmoderr.h
../../include/freetype2/ftotval.h ftotval.h
../../include/freetype2/ftoutln.h ftoutln.h
../../include/freetype2/ftpfr.h ftpfr.h
../../include/freetype2/ftrender.h ftrender.h
../../include/freetype2/ftsizes.h ftsizes.h
../../include/freetype2/ftsnames.h ftsnames.h
../../include/freetype2/ftstroke.h ftstroke.h
../../include/freetype2/ftsynth.h ftsynth.h
../../include/freetype2/ftsystem.h ftsystem.h
../../include/freetype2/fttrigon.h fttrigon.h
../../include/freetype2/fttypes.h fttypes.h
../../include/freetype2/ftwinfnt.h ftwinfnt.h
../../include/freetype2/t1tables.h t1tables.h
../../include/freetype2/ttnameid.h ttnameid.h
../../include/freetype2/tttables.h tttables.h
../../include/freetype2/tttags.h tttags.h
../../include/freetype2/ttunpat.h ttunpat.h
../../include/freetype/ft2build.h
../../include/freetype/config/ftconfig.h config/ftconfig.h
../../include/freetype/config/ftheader.h config/ftheader.h
../../include/freetype/config/ftmodule.h config/ftmodule.h
../../include/freetype/config/ftoption.h config/ftoption.h
../../include/freetype/config/ftstdlib.h config/ftstdlib.h
../../include/freetype/freetype.h freetype.h
../../include/freetype/ftbbox.h ftbbox.h
../../include/freetype/ftbdf.h ftbdf.h
../../include/freetype/ftbitmap.h ftbitmap.h
../../include/freetype/ftcache.h ftcache.h
../../include/freetype/ftcid.h ftcid.h
../../include/freetype/fterrdef.h fterrdef.h
../../include/freetype/fterrors.h fterrors.h
../../include/freetype/ftfntfmt.h ftfntfmt.h
../../include/freetype/ftgasp.h ftgasp.h
../../include/freetype/ftglyph.h ftglyph.h
../../include/freetype/ftgxval.h ftgxval.h
../../include/freetype/ftgzip.h ftgzip.h
../../include/freetype/ftbzip2.h ftbzip2.h
../../include/freetype/ftimage.h ftimage.h
../../include/freetype/ftincrem.h ftincrem.h
../../include/freetype/ftlcdfil.h ftlcdfil.h
../../include/freetype/ftlist.h ftlist.h
../../include/freetype/ftlzw.h ftlzw.h
../../include/freetype/ftmac.h ftmac.h
../../include/freetype/ftmm.h ftmm.h
../../include/freetype/ftmodapi.h ftmodapi.h
../../include/freetype/ftmoderr.h ftmoderr.h
../../include/freetype/ftotval.h ftotval.h
../../include/freetype/ftoutln.h ftoutln.h
../../include/freetype/ftpfr.h ftpfr.h
../../include/freetype/ftrender.h ftrender.h
../../include/freetype/ftsizes.h ftsizes.h
../../include/freetype/ftsnames.h ftsnames.h
../../include/freetype/ftstroke.h ftstroke.h
../../include/freetype/ftsynth.h ftsynth.h
../../include/freetype/ftsystem.h ftsystem.h
../../include/freetype/fttrigon.h fttrigon.h
../../include/freetype/fttypes.h fttypes.h
../../include/freetype/ftwinfnt.h ftwinfnt.h
../../include/freetype/t1tables.h t1tables.h
../../include/freetype/ttnameid.h ttnameid.h
../../include/freetype/tttables.h tttables.h
../../include/freetype/tttags.h tttags.h
../../include/freetype/ttunpat.h ttunpat.h
......@@ -172,7 +172,7 @@ include $(TOP_DIR)/builds/modules.mk
# get FreeType version string, using a
# poor man's `sed' emulation with make's built-in string functions
#
work := $(strip $(shell $(CAT) $(TOP_DIR)/include/freetype2/freetype.h))
work := $(strip $(shell $(CAT) $(TOP_DIR)/include/freetype/freetype.h))
work := $(subst |,x,$(work))
work := $(subst $(space),|,$(work))
work := $(subst \#define|FREETYPE_MAJOR|,$(space),$(work))
......
......@@ -70,11 +70,6 @@ AC_SUBST(CC_BUILD)
AC_SUBST(EXEEXT_BUILD)
# auxiliary programs
AC_CHECK_PROG([RMDIR], [rmdir], [rmdir])
# Since this file will be finally moved to another directory we make
# the path of the install script absolute. This small code snippet has
# been taken from automake's `ylwrap' script.
......
......@@ -124,22 +124,20 @@ else
fi
if test "$echo_ft_version" = "yes" ; then
major=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
| grep FREETYPE_MAJOR \
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
minor=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
| grep FREETYPE_MINOR \
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
patch=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
| grep FREETYPE_PATCH \
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
echo $major.$minor.$patch
fi
if test "$echo_cflags" = "yes" ; then
if test "${SYSROOT}$includedir" != "/usr/include"; then
echo -I${SYSROOT}$includedir
fi
echo -I${SYSROOT}$includedir/freetype2
fi
if test "$echo_libs" = "yes" ; then
......
......@@ -11,4 +11,4 @@ Requires:
Requires.private: %REQUIRES_PRIVATE%
Libs: -L${libdir} -lfreetype
Libs.private: %LIBS_PRIVATE%
Cflags: -I${includedir}
Cflags: -I${includedir}/freetype2
......@@ -86,7 +86,7 @@ FT_BEGIN_HEADER
#else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
/* Following cpp computation of the bit length of int and long */
/* is copied from default include/freetype2/config/ftconfig.h. */
/* is copied from default include/freetype/config/ftconfig.h. */
/* If any improvement is required for this file, it should be */
/* applied to the original header file for the builders that */
/* do not use configure script. */
......
......@@ -24,38 +24,34 @@
# Unix installation and deinstallation targets.
#
# Note that we remove any data in the `freetype' subdirectory found in
# `$(includedir)/freetype2', which was the previous location of the header
# files up to version 2.5.0.
# Note that we remove any data found in `$(includedir)/freetype2' before
# installing new files to avoid interferences with files installed by
# previous FreeType versions (which use slightly different locations).
#
install: $(PROJECT_LIBRARY)
$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(libdir)/pkgconfig \
$(DESTDIR)$(includedir)/freetype2/config \
$(DESTDIR)$(bindir) \
$(DESTDIR)$(datadir)/aclocal \
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2
$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(libdir)/pkgconfig \
$(DESTDIR)$(includedir)/freetype2/freetype/config \
$(DESTDIR)$(bindir) \
$(DESTDIR)$(datadir)/aclocal \
$(DESTDIR)$(mandir)/man1
$(LIBTOOL) --mode=install $(INSTALL) \
$(PROJECT_LIBRARY) $(DESTDIR)$(libdir)
-for P in $(PUBLIC_H) ; do \
$(INSTALL_DATA) \
$$P $(DESTDIR)$(includedir)/freetype2 ; \
-for P in $(PUBLIC_H) ; do \
$(INSTALL_DATA) \
$$P $(DESTDIR)$(includedir)/freetype2/freetype ; \
done
-for P in $(CONFIG_H) ; do \
$(INSTALL_DATA) \
$$P $(DESTDIR)$(includedir)/freetype2/config ; \
-for P in $(CONFIG_H) ; do \
$(INSTALL_DATA) \
$$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \
done
$(INSTALL_DATA) $(TOP_DIR)/include/ft2build.h \
$(DESTDIR)$(includedir)/ft2build.h
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/*
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/*
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/ft2build.h
$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \
$(DESTDIR)$(includedir)/freetype2/config/ftconfig.h
$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h \
$(DESTDIR)$(includedir)/freetype2/config/ftmodule.h
$(INSTALL_DATA) $(TOP_DIR)/include/ft2build.h \
$(DESTDIR)$(includedir)/freetype2/ft2build.h
$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \
$(DESTDIR)$(includedir)/freetype2/freetype/config/ftconfig.h
$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h \
$(DESTDIR)$(includedir)/freetype2/freetype/config/ftmodule.h
$(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config \
$(DESTDIR)$(bindir)/freetype-config
$(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \
......@@ -68,11 +64,7 @@ install: $(PROJECT_LIBRARY)
uninstall:
-$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(LIBRARY).$A
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/config/*
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/config
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/*
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2
-$(DELETE) $(DESTDIR)$(includedir)/ft2build.h
-$(DELETE) $(DESTDIR)$(bindir)/freetype-config
-$(DELETE) $(DESTDIR)$(datadir)/aclocal/freetype2.m4
-$(DELETE) $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc
......@@ -94,7 +86,6 @@ clean_project_unix:
distclean_project_unix: clean_project_unix
-$(DELETE) $(PROJECT_LIBRARY)
-$(DELETE) $(OBJ_DIR)/.libs/*
-$(DELDIR) $(OBJ_DIR)/.libs
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
......
......@@ -17,7 +17,7 @@ SHELL := @SHELL@
TOP_DIR := $(shell cd $(TOP_DIR); pwd)
DELETE := rm -f
DELDIR := @RMDIR@
DELDIR := rm -rf
CAT := cat
SEP := /
......
......@@ -148,8 +148,8 @@
/* for the memory and stream components which are set to 6 and 5, */
/* respectively. */
/* */
/* See the file <internal/fttrace.h> for details of the available toggle */
/* names. */
/* See the file `include/freetype/internal/fttrace.h' for details of the */
/* available toggle names. */
/* */
/* The level must be between 0 and 6; 0 means quiet (except for serious */
/* runtime errors), and 6 means _very_ verbose. */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment