$NetBSD: patch-aa,v 1.8 2004/10/12 21:02:18 ben Exp $ --- Makefile.orig 2002-09-20 19:26:57.000000000 +0200 +++ Makefile @@ -8,20 +8,20 @@ ####### Compiler, tools and options -CC = gcc -CXX = g++ -LEX = flex -YACC = yacc -CFLAGS = -pipe -Wall -W -O2 -DQT_NO_DEBUG -CXXFLAGS = -pipe -Wall -W -O2 -DQT_NO_DEBUG +CC ?= gcc +CXX ?= g++ +LEX ?= flex +YACC ?= yacc +CFLAGS += -Wall -W -DQT_NO_DEBUG +CXXFLAGS += -Wall -W -DQT_NO_DEBUG LEXFLAGS = YACCFLAGS= -d -INCPATH = -I$(QTDIR)/include -I$(QTDIR)/mkspecs/linux-g++ +INCPATH = -I$(QTDIR)/include -I$(X11BASE)/include LINK = g++ LFLAGS = -LIBS = $(SUBLIBS) -Wl,-rpath,$(QTDIR)/lib -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm -AR = ar cqs -RANLIB = +LIBS = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -Wl,-R$(LOCALBASE)/lib -L$(LOCALBASE)/lib -lqt-mt -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg +AR ?= ar cqs +RANLIB ?= MOC = $(QTDIR)/bin/moc UIC = $(QTDIR)/bin/uic QMAKE = qmake @@ -1766,6 +1766,9 @@ moc_ractzoom.o: moc_ractzoom.cpp ractzoo moc_rappwin.o: moc_rappwin.cpp rappwin.h ractiondef.h \ rprgdef.h +.if (${MACHINE_ARCH} == "alpha") + $(CXX) -c $(CXXFLAGS_NOOPT) $(INCPATH) -o $@ moc_rappwin.cpp +.endif moc_rattribdialog.o: moc_rattribdialog.cpp rattribdialog.h rcombobox.h \ rgraphdef.h \ @@ -1836,6 +1839,9 @@ moc_rgraphic.o: moc_rgraphic.cpp rgraphi rtypes.h \ rprgdef.h \ rmathdef.h +.if (${MACHINE_ARCH} == "alpha") + $(CXX) -c $(CXXFLAGS_NOOPT) $(INCPATH) -o $@ moc_rgraphic.cpp +.endif moc_rgroupbox.o: moc_rgroupbox.cpp rgroupbox.h