contextfree (2.2+dfsg1-2) 01_use_external_libagg

Summary

 Makefile |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

    
download this patch

Patch contents

#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_use_external_libagg.dpatch by Bram Senders <bram@luon.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Do not compile and link to src-agg/src/*.cpp sources, but link to
## DP: /usr/lib/libagg.a from the libagg-dev package instead.  The agg headers
## DP: used are still from the internal copy, as they have been modified.

@DPATCH@
diff -urNad contextfree-2.2~/Makefile contextfree-2.2/Makefile
--- contextfree-2.2~/Makefile	2009-02-07 21:46:29.000000000 +0100
+++ contextfree-2.2/Makefile	2009-02-07 21:47:25.000000000 +0100
@@ -13,7 +13,7 @@
 DERIVED_DIR = $(OBJ_DIR)
 AGG_DIR = src-agg
 
-SRC_DIRS = $(COMMON_DIR) $(UNIX_DIR) $(DERIVED_DIR) $(AGG_DIR)/src
+SRC_DIRS = $(COMMON_DIR) $(UNIX_DIR) $(DERIVED_DIR)
 vpath %.cpp $(SRC_DIRS)
 vpath %.c	$(SRC_DIRS)
 
@@ -34,10 +34,7 @@
 
 DERIVED_SRCS = lex.yy.c y.tab.c
 
-AGG_SRCS = agg_trans_affine.cpp agg_curves.cpp agg_vcgen_contour.cpp \
-    agg_vcgen_stroke.cpp agg_bezier_arc.cpp
-
-SRCS = $(COMMON_SRCS) $(UNIX_SRCS) $(DERIVED_SRCS) $(AGG_SRCS)
+SRCS = $(COMMON_SRCS) $(UNIX_SRCS) $(DERIVED_SRCS)
 OBJS = $(patsubst %.c,$(OBJ_DIR)/%.o, \
 	$(patsubst %.cpp,$(OBJ_DIR)/%.o,$(SRCS)))
 DEPS = $(patsubst %.o,%.d,$(OBJS))
@@ -54,7 +51,7 @@
 # Under Cygwin replace strip $@ with strip $@.exe
 
 cfdg: $(OBJS)
-	$(LINK.o) $^ -L/usr/local/lib -lstdc++ -lpng -lz -fexceptions -o $@
+	$(LINK.o) $^ /usr/lib/libagg.a -L/usr/local/lib -lstdc++ -lpng -lz -fexceptions -o $@
 	strip $@