[ot-svg] Makes `rsvg_port.c' a part of the single build.

5 files changed, 12 insertions, 28 deletions

diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index 6b0ec7537..1aae11c87 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -1125,7 +1125,6 @@ else
   ftoption_unset FT_CONFIG_OPTION_USE_HARFBUZZ
 fi
 
-COMPILE_SVG_PORT=no
 if test "$with_svg" = no-default; then
   ftoption_set FT_CONFIG_OPTION_SVG
   ftoption_unset FT_CONFIG_OPTION_DEFAULT_SVG
@@ -1140,12 +1139,10 @@ else
   LIBRSVG_CFLAGS=$(echo $LIBRSVG_CFLAGS | sed -e 's/freetype2//g')
   CFLAGS="$CFLAGS $LIBRSVG_CFLAGS"
   LDFLAGS="$LDFLAGS $LIBRSVG_LIBS"
-  COMPILE_SVG_PORT=yes
   ftoption_set FT_CONFIG_OPTION_SVG
   ftoption_set FT_CONFIG_OPTION_DEFAULT_SVG
 fi
 
-AC_SUBST([COMPILE_SVG_PORT])
 AC_SUBST([CFLAGS])
 AC_SUBST([LDFLAGS])
 
diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in
index 6331845ea..ed51fde34 100644
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@@ -81,8 +81,6 @@ T := -o$(space)
 CPPFLAGS := @CPPFLAGS@
 CFLAGS   := -c @XX_CFLAGS@ @CFLAGS@ -DFT_CONFIG_CONFIG_H="<ftconfig.h>"
 
-COMPILE_SVG_PORT := @COMPILE_SVG_PORT@
-
 # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
 #
 ANSIFLAGS := @XX_ANSIFLAGS@
diff --git a/src/svg/ftsvg.c b/src/svg/ftsvg.c
index 8cc5691fa..b56d719a1 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 5acad2dab..5d3f09f90 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 6dbeae442..f0b4ee573 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 */