$NetBSD: patch-aa,v 1.3 2001/08/29 22:41:06 jlam Exp $ --- Makefile.orig Sun Mar 25 06:17:10 2001 +++ Makefile @@ -7,13 +7,14 @@ ####### Compiler, tools and options -CC = g++ -CFLAGS = -Wall -W -O2 -fno-strength-reduce +#CC = g++ +CXXFLAGS+= -fno-strength-reduce +CFLAGS+= -fno-strength-reduce INCPATH = -I$(QTDIR)/include -LINK = g++ -LFLAGS = -static -LIBS = -L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11 -MOC = moc +LINK = $(CXX) +LFLAGS = ${LDFLAGS} +LIBS = -L$(QTDIR)/lib -lqt -L${BUILDLINK_X11_DIR}/lib -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg +MOC = $(QTDIR)/bin/moc ####### Files @@ -367,13 +368,13 @@ .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .cxx.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .cc.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .C.o: $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<