[freetype2] GSoC-2019-moazin 787bbd8 4/4: [ot-svg] Makes `rsvg_port.c' a part of the single build.

[Moazin Khatti]

branch: GSoC-2019-moazin
commit 787bbd87ca1a7b18139de1dc828586c8f46dbd3c
Author: Moazin Khatti <address@hidden>
Commit: Moazin Khatti <address@hidden>

    [ot-svg] Makes `rsvg_port.c' a part of the single build.
---
 src/svg/ftsvg.c  |  4 ++--
 src/svg/rules.mk | 25 ++++---------------------
 src/svg/svg.c    |  6 ++++++
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/svg/ftsvg.c b/src/svg/ftsvg.c
index 8cc5691..b56d719 100644
--- a/src/svg/ftsvg.c
+++ b/src/svg/ftsvg.c
@@ -24,10 +24,10 @@
 #include FT_BBOX_H
 
 #include "svgtypes.h"
-
 #ifdef FT_CONFIG_OPTION_DEFAULT_SVG
-#include <rsvg_port.h>
+#include "rsvg_port.h"
 #endif
+
 #include <stdio.h>
 
 #include "ftsvg.h"
diff --git a/src/svg/rules.mk b/src/svg/rules.mk
index 5acad2d..5d3f09f 100644
--- a/src/svg/rules.mk
+++ b/src/svg/rules.mk
@@ -24,20 +24,17 @@ SVG_COMPILE := $(CC) $(ANSIFLAGS)                           
 \
                      $(INCLUDE_FLAGS)                        \
                      $(FT_CFLAGS)
 
-# seperate compilation command for default rendering port files
-SVG_PORT_COMPILE := $(CC) $I$(subst /,$(COMPILER_SEP),$(SVG_DIR)) \
-                                           $(INCLUDE_FLAGS)                    
    \
-                                           $(FT_CFLAGS)
-
 # svg renderer sources (i.e., C files)
 #
-SVG_DRV_SRC := $(SVG_DIR)/ftsvg.c
+SVG_DRV_SRC := $(SVG_DIR)/ftsvg.c \
+                    $(SVG_DIR)/rsvg_port.c
 
 
 # svg renderer headers
 #
 SVG_DRV_H := $(SVG_DIR)/ftsvg.h \
-                  $(SVG_DIR)/svgtypes.h
+                  $(SVG_DIR)/svgtypes.h \
+                                                $(SVG_DIR)/rsvg_port.h
 
 
 # svg renderer object(s)
@@ -55,15 +52,6 @@ SVG_DRV_SRC_S := $(SVG_DIR)/svg.c
 
 # svg renderer - single object
 #
-
-SVG_PORT_SRC_S := $(SVG_DIR)/rsvg_port.c
-SVG_PORT_OBJ_S := $(OBJ_DIR)/rsvg_port.$O
-
-ifeq ($(COMPILE_SVG_PORT), yes)
-$(SVG_PORT_OBJ_S): $(SVG_PORT_SRC_S) $(FREETYPE_H)
-       $(SVG_PORT_COMPILE) $T$(subst /,$(COMPILER_SEP), $@ $(SVG_PORT_SRC_S))
-endif
-
 $(SVG_DRV_OBJ_S): $(SVG_DRV_SRC_S) $(SVG_DRV_SRC) \
                      $(FREETYPE_H) $(SVG_DRV_H)
        $(SVG_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(SVG_DRV_SRC_S))
@@ -80,9 +68,4 @@ $(OBJ_DIR)/%.$O: $(SVG_DIR)/%.c $(FREETYPE_H) $(SVG_DRV_H)
 DRV_OBJS_S += $(SVG_DRV_OBJ_S)
 DRV_OBJS_M += $(SVG_DRV_OBJ_M)
 
-ifeq ($(COMPILE_SVG_PORT), yes)
-DRV_OBJS_S += $(SVG_PORT_OBJ_S)
-DRV_OBJS_M += $(SVG_PORT_OBJ_S)
-endif
-
 # EOF
diff --git a/src/svg/svg.c b/src/svg/svg.c
index 6dbeae4..f0b4ee5 100644
--- a/src/svg/svg.c
+++ b/src/svg/svg.c
@@ -17,9 +17,15 @@
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
 #include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FT_CONFIG_OPTION_DEFAULT_SVG
+#include "rsvg_port.c"
+#endif
 
 #include "svgtypes.h"
 #include "ftsvg.c"
 
 
+
 /* END */