[ft-devel] patch for ft2demos - fttimer linking against X11

[Ryan Hill]

While adding the option to build ft2demos on headless systems to our
freetype2 ebuild, I found that after modifying the Makefile to not build
utilities that require a GUI, grx11.c was still being built, causing the
following build error:


i686-pc-linux-gnu-gcc -c  -O2 -march=prescott -pipe -fno-strict-aliasing
-DFT_CONFIG_OPTION_SYSTEM_ZLIB -DFT_CONFIG_CONFIG_H="<ftconfig.h>"
-I/var/tmp/portage/freetype-2.3.3/work/ft2demos-2.3.3/graph \

-I/var/tmp/portage/freetype-2.3.3/work/ft2demos-2.3.3/graph/x11
\
                -I/usr/X11R6/include \
                -o
/var/tmp/portage/freetype-2.3.3/work/ft2demos-2.3.3/obj/grx11.o
/var/tmp/portage/freetype-2.3.3/work/ft2demos-2.3.3/graph/x11/grx11.c
/var/tmp/portage/freetype-2.3.3/work/ft2demos-2.3.3/graph/x11/grx11.c:35:22:
X11/Xlib.h: No such file or directory


The cause is the Makefile using $(GRAPH_LIB) and $(LINK_GRAPH) to build
fttimer.c, which as far as I can see shouldn't need X headers.

The attached patch should fix this.


-- 
                                where to now? if i had to guess
dirtyepic gentoo org        i'm afraid to say antarctica's next
9B81 6C9F E791 83BB 3AB3  5B2D E625 A073 8379 37E8 (0x837937E8)

diff -Naur ft2demos-2.3.3-orig/Makefile ft2demos-2.3.3/Makefile
--- ft2demos-2.3.3-orig/Makefile        2007-05-08 17:07:01.000000000 -0600
+++ ft2demos-2.3.3/Makefile     2007-05-08 17:17:35.000000000 -0600
@@ -308,6 +308,9 @@
   $(OBJ_DIR_2)/ftmemchk.$(SO): $(SRC_DIR)/ftmemchk.c
          $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
+  $(OBJ_DIR_2)/fttimer.$(SO): $(SRC_DIR)/fttimer.c
+         $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
+
   $(OBJ_DIR_2)/fttry.$(SO): $(SRC_DIR)/fttry.c
          $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
@@ -338,10 +341,6 @@
          $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
                      $T$(subst /,$(COMPILER_SEP),$@ $<)
 
-  $(OBJ_DIR_2)/fttimer.$(SO): $(SRC_DIR)/fttimer.c $(GRAPH_LIB)
-         $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
-                     $T$(subst /,$(COMPILER_SEP),$@ $<)
-
 
 # $(OBJ_DIR_2)/ftsbit.$(SO): $(SRC_DIR)/ftsbit.c $(GRAPH_LIB)
 #       $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
@@ -441,6 +440,9 @@
   $(BIN_DIR_2)/ftdump$E: $(OBJ_DIR_2)/ftdump.$(SO) $(FTLIB)
          $(LINK_COMMON)
 
+  $(BIN_DIR_2)/fttimer$E: $(OBJ_DIR_2)/fttimer.$(SO) $(FTLIB) $(COMMON_OBJ)
+         $(LINK_COMMON)
+
   $(BIN_DIR_2)/fttry$E: $(OBJ_DIR_2)/fttry.$(SO) $(FTLIB)
          $(LINK)
 
@@ -481,10 +483,6 @@
                            $(GRAPH_LIB) $(COMMON_OBJ) $(FTCOMMON_OBJ)
          $(LINK_NEW)
 
-  $(BIN_DIR_2)/fttimer$E: $(OBJ_DIR_2)/fttimer.$(SO) $(FTLIB) \
-                          $(GRAPH_LIB) $(COMMON_OBJ)
-         $(LINK_GRAPH)
-
 
 endif