29 lines
681 B
Text
29 lines
681 B
Text
$NetBSD: patch-aa,v 1.3 2004/06/15 04:11:15 minskim Exp $
|
|
|
|
--- makefile.orig 2004-03-15 18:17:57.000000000 -0600
|
|
+++ makefile
|
|
@@ -43,11 +43,11 @@ INSPECTSRC = ./xmillinspect
|
|
PPMZIPSRC = ./ppmzip
|
|
PPMSRC = ./ppmdi
|
|
|
|
-CPP = g++
|
|
-CC = gcc
|
|
-LINK = g++
|
|
+CPP = ${CXX}
|
|
+#CC = gcc
|
|
+LINK = ${CXX}
|
|
|
|
-CFLAGS = -c
|
|
+CFLAGS += -c
|
|
|
|
# To use MSXML. Does not work with GCC on Windows (mingw)
|
|
#CFLAGS = -c -DHAVE_MSXML
|
|
@@ -84,7 +84,7 @@ CPPFLAGS_XDEMILL = $(CFLAGS) ${CPPFLAGS_
|
|
CPPFLAGS_XMILLTEST = $(CFLAGS) -IXMill
|
|
CPPFLAGS_PPMZIP = $(CFLAGS) -Ippmdi
|
|
|
|
-LDLIBS=${ZLIB_LDFLAGS} ${BZLIB_LDFLAGS}
|
|
+LDLIBS=${LDFLAGS} ${ZLIB_LDFLAGS} ${BZLIB_LDFLAGS}
|
|
# LINK_FLAGS = -L.
|
|
|
|
XMILLLIB_MISC = \
|