$NetBSD: patch-aa,v 1.6 2015/07/04 16:18:36 joerg Exp $ --- Makefile.orig 2001-03-16 14:08:18.000000000 -0500 +++ Makefile 2008-08-17 02:14:47.000000000 -0400 @@ -12,10 +12,11 @@ # SO Extension for shared libs. HAVE_JPEG = 1 -PY_INCLUDE = -I/usr/local/include/python2.0 -LIB_DIRS = -L/usr/local/lib -L/usr/lib -GCC = gcc -CFLAGS = -Wall -fpic -O2 +INC_DIRS = -I${GDCHART_INCLUDE} -I$(GD_INCLUDE) -I$(PYTHON_INCLUDE) +LIB_DIRS = -L${LOCALBASE}/lib -L/usr/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib +GCC = ${CC} +CFLAGS ?= -Wall -fpic -O2 +CFLAGS+=-fPIC # Linux LD = $(GCC) -shared @@ -31,21 +32,19 @@ SO = .so # Shouldn't need to touch anything below this point. -GD = gd-1.8.4 -LIBGD = $(GD)/libgd.a - -GDCHART = gdchart0.10.1dev -LIBGDCHART = $(GDCHART)/libgdchart.a - DEFS = ifeq ($(HAVE_JPEG),1) DEFS += -DHAVE_JPEG - LIBJPEG = -ljpeg + LIBS = -ljpeg +endif +ifeq ($(HAVE_LIBFREETYPE),1) + DEFS += -DHAVE_LIBFREETYPE + LIBS += -lfreetype endif -CFLAGS += -I$(GDCHART) $(PY_INCLUDE) $(DEFS) -LDFLAGS = -L$(GDCHART) -L$(GD) $(LIB_DIRS) -LDLIBS = -lgdchart -lgd -lpng -lz $(LIBJPEG) +CFLAGS += ${INC_DIRS} $(DEFS) +LDFLAGS = $(LIB_DIRS) +LDLIBS = -lgdchart -lgd -lpng -lz $(LIBS) TARGET = gdchart$(SO) PY_SRC = gdc_py.c @@ -53,19 +52,11 @@ PY_OBJ = $(PY_SRC:.c=.o) all: $(TARGET) -$(TARGET): $(LIBGD) $(LIBGDCHART) $(PY_OBJ) +$(TARGET): $(PY_OBJ) $(LD) $(PY_OBJ) $(LDFLAGS) $(LDLIBS) -o $@ $(PY_OBJ): $(PY_SRC) $(GCC) -c $(CFLAGS) $< -$(LIBGD): - make -C $(GD) libgd.a HAVE_JPEG=$(HAVE_JPEG) - -$(LIBGDCHART): - make -C $(GDCHART) libgdchart.a HAVE_JPEG=$(HAVE_JPEG) - clean: - -make -C $(GD) clean - -make -C $(GDCHART) clean -rm -f $(TARGET) $(PY_OBJ)