freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2-demos] master 44f64424 1/2: * Makefile (FTCOMMON_OBJ): Add `g


From: Werner Lemberg
Subject: [freetype2-demos] master 44f64424 1/2: * Makefile (FTCOMMON_OBJ): Add `graph` dependency, include `rsvg-port`.
Date: Mon, 29 Aug 2022 22:14:09 -0400 (EDT)

branch: master
commit 44f64424115d7ee1e032c65196bc47f2d5f87ffc
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    * Makefile (FTCOMMON_OBJ): Add `graph` dependency, include `rsvg-port`.
---
 Makefile | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index daead73a..cded506a 100644
--- a/Makefile
+++ b/Makefile
@@ -374,25 +374,10 @@ else
   $(OBJ_DIR_2)/mlgetopt.$(SO): $(SRC_DIR)/mlgetopt.c
   COMMON_OBJ := $(OBJ_DIR_2)/common.$(SO) \
                 $(OBJ_DIR_2)/strbuf.$(SO) \
-                $(OBJ_DIR_2)/rsvg-port.$(SO) \
                 $(OBJ_DIR_2)/output.$(SO) \
                 $(OBJ_DIR_2)/md5.$(SO) \
                 $(OBJ_DIR_2)/mlgetopt.$(SO)
 
-  $(OBJ_DIR_2)/ftcommon.$(SO): $(SRC_DIR)/ftcommon.c $(SRC_DIR)/ftcommon.h
-         $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
-                     $T$(subst /,$(COMPILER_SEP),$@ $<)
-
-  $(OBJ_DIR_2)/ftpngout.$(SO): $(SRC_DIR)/ftpngout.c $(SRC_DIR)/ftcommon.h
-         $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
-                     $T$(subst /,$(COMPILER_SEP),$@ $<)
-
-  $(OBJ_DIR_2)/rsvg-port.$(SO): $(SRC_DIR)/rsvg-port.c $(SRC_DIR)/rsvg-port.h
-         $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
-
-  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),$@ $<)
 
@@ -471,6 +456,23 @@ else
          $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
                      $T$(subst /,$(COMPILER_SEP),$@ $<)
 
+  $(OBJ_DIR_2)/ftcommon.$(SO): $(SRC_DIR)/ftcommon.c \
+                               $(SRC_DIR)/ftcommon.h \
+                               $(GRAPH_LIB)
+         $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
+                     $T$(subst /,$(COMPILER_SEP),$@ $<)
+
+  $(OBJ_DIR_2)/ftpngout.$(SO): $(SRC_DIR)/ftpngout.c $(SRC_DIR)/ftcommon.h
+         $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
+                     $T$(subst /,$(COMPILER_SEP),$@ $<)
+
+  $(OBJ_DIR_2)/rsvg-port.$(SO): $(SRC_DIR)/rsvg-port.c $(SRC_DIR)/rsvg-port.h
+         $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
+
+  FTCOMMON_OBJ := $(OBJ_DIR_2)/ftcommon.$(SO) \
+                  $(OBJ_DIR_2)/ftpngout.$(SO) \
+                  $(OBJ_DIR_2)/rsvg-port.$(SO)
+
 
   ####################################################################
   #



reply via email to

[Prev in Thread] Current Thread [Next in Thread]