[freetype2-demos] master 354ffad: * Makefile: Reduce FT2_BUILD_FREETYPE usage

[Werner Lemberg]

branch: master
commit 354ffad22518ad8a2d5b6db3c5d41bed9caae2f5
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    * Makefile: Reduce FT2_BUILD_FREETYPE usage
    
    Public macro FT_FACE_DRIVER_NAME utilized in d01c79af9838 makes
    FT2_BUILD_LIBRARY unnecassary in most cases.
    
    * src/ftinspect/ftinspect.pro: Ditto.
---
 Makefile                    | 79 ++++++++++++---------------------------------
 src/ftinspect/ftinspect.pro |  3 --
 2 files changed, 20 insertions(+), 62 deletions(-)

diff --git a/Makefile b/Makefile
index 8bb8666..4e10ff1 100644
--- a/Makefile
+++ b/Makefile
@@ -364,6 +364,9 @@ else
   FTCOMMON_OBJ := $(OBJ_DIR_2)/ftcommon.$(SO) \
                   $(OBJ_DIR_2)/ftpngout.$(SO)
 
+  $(OBJ_DIR_2)/ftdump.$(SO): $(SRC_DIR)/ftdump.c
+         $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
+
   $(OBJ_DIR_2)/ftlint.$(SO): $(SRC_DIR)/ftlint.c
          $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
@@ -404,91 +407,49 @@ else
          $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
                      $T$(subst /,$(COMPILER_SEP),$@ $<)
 
-  $(OBJ_DIR_2)/ftmulti.$(SO): $(SRC_DIR)/ftmulti.c \
-                              $(GRAPH_LIB)
-         $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
-                     $T$(subst /,$(COMPILER_SEP),$@ $<)
-
   $(OBJ_DIR_2)/ftstring.$(SO): $(SRC_DIR)/ftstring.c \
                                $(SRC_DIR)/ftcommon.h \
                                $(GRAPH_LIB)
          $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
                      $T$(subst /,$(COMPILER_SEP),$@ $<)
 
-
-  ####################################################################
-  #
-  # Special rule to compile the `ftdump' program as it includes
-  # internal header files.
-  #
-  $(OBJ_DIR_2)/ftdump.$(SO): $(SRC_DIR)/ftdump.c
-         $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) $DFT2_BUILD_LIBRARY
-
-
-  ####################################################################
-  #
-  # Special rule to compile the `t1dump' program as it includes
-  # the Type1 source path.
-  #
-  $(OBJ_DIR_2)/t1dump.$(SO): $(SRC_DIR)/t1dump.c
-         $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
-
-
-  ####################################################################
-  #
-  # Special rule to compile the `ftvalid' program as it includes
-  # internal header files.
-  #
-  $(OBJ_DIR_2)/ftvalid.$(SO): $(SRC_DIR)/ftvalid.c
-         $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) $DFT2_BUILD_LIBRARY
-
-
-  ####################################################################
-  #
-  # Special rule to compile the `ftview' program as it includes
-  # internal header files.
-  #
   $(OBJ_DIR_2)/ftview.$(SO): $(SRC_DIR)/ftview.c \
                              $(SRC_DIR)/ftcommon.h \
                              $(GRAPH_LIB)
          $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
-                     $T$(subst /,$(COMPILER_SEP),$@ $<) $DFT2_BUILD_LIBRARY
-
+                     $T$(subst /,$(COMPILER_SEP),$@ $<)
 
-  ####################################################################
-  #
-  # Special rule to compile the `ftsdf' program as it includes
-  # internal header files.
-  #
   $(OBJ_DIR_2)/ftsdf.$(SO): $(SRC_DIR)/ftsdf.c \
                             $(SRC_DIR)/ftcommon.h \
                             $(GRAPH_LIB)
          $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
-                     $T$(subst /,$(COMPILER_SEP),$@ $<) $DFT2_BUILD_LIBRARY
-
+                     $T$(subst /,$(COMPILER_SEP),$@ $<)
 
-  ####################################################################
-  #
-  # Special rule to compile the `ftdiff' program as it includes
-  # internal header files.
-  #
   $(OBJ_DIR_2)/ftdiff.$(SO): $(SRC_DIR)/ftdiff.c \
                              $(SRC_DIR)/ftcommon.h \
                              $(GRAPH_LIB)
          $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
-                     $T$(subst /,$(COMPILER_SEP),$@ $<) $DFT2_BUILD_LIBRARY
+                     $T$(subst /,$(COMPILER_SEP),$@ $<)
+
+  $(OBJ_DIR_2)/ftgrid.$(SO): $(SRC_DIR)/ftgrid.c \
+                             $(SRC_DIR)/ftcommon.h \
+                             $(GRAPH_LIB)
+         $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
+                     $T$(subst /,$(COMPILER_SEP),$@ $<)
+
+  $(OBJ_DIR_2)/ftmulti.$(SO): $(SRC_DIR)/ftmulti.c \
+                              $(GRAPH_LIB)
+         $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
+                     $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
   ####################################################################
   #
-  # Special rule to compile the `ftgrid' program as it includes
+  # Special rule to compile the `ftvalid' program as it includes
   # internal header files.
   #
-  $(OBJ_DIR_2)/ftgrid.$(SO): $(SRC_DIR)/ftgrid.c \
-                             $(SRC_DIR)/ftcommon.h \
-                             $(GRAPH_LIB)
-         $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
-                     $T$(subst /,$(COMPILER_SEP),$@ $<) $DFT2_BUILD_LIBRARY
+  $(OBJ_DIR_2)/ftvalid.$(SO): $(SRC_DIR)/ftvalid.c
+         $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) $DFT2_BUILD_LIBRARY
 
 
   ####################################################################
diff --git a/src/ftinspect/ftinspect.pro b/src/ftinspect/ftinspect.pro
index 0481dff..b99a935 100644
--- a/src/ftinspect/ftinspect.pro
+++ b/src/ftinspect/ftinspect.pro
@@ -19,9 +19,6 @@ win32 {
 
 CONFIG += qt debug
 
-# we need access to internal FreeType header files
-DEFINES += FT2_BUILD_LIBRARY
-
 SOURCES += \
   engine/engine.cpp \
   rendering/glyphbitmap.cpp \