$NetBSD: patch-aa,v 1.2 2000/03/28 00:12:32 dmcmahill Exp $ --- Makefile.orig Wed Dec 9 03:41:59 1998 +++ Makefile Sun Mar 26 10:55:12 2000 @@ -1,8 +1,8 @@ VERSION=1.6 -LDFLAGS=-L/usr/X11/lib -L$(QTDIR)/lib +LDFLAGS=-L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib LDLIBS=$(LIBRARY) -lqt -lX11 -CXXFLAGS=-Wall -g -I$(QTDIR)/include -I. -#CXXFLAGS=-Wall -O2 -I$(QTDIR)/include -I. +#CXXFLAGS=-Wall -g -I$(PREFIX)/include/qt -I. +CXXFLAGS=-Wall -O2 -I$(QTDIR)/include -I. MOCS=moc_QwSpriteField.cpp SRC=QwSpriteField.cpp QwSpriteField-double.cpp QwSpriteField-int.cpp \ @@ -12,10 +12,10 @@ QwSpriteField-mobdouble.o QwSpriteField-mobint.o QwCluster.o \ moc_QwSpriteField.o -LIBRARY=libQwSpriteField.a +LIBRARY=libQwSpriteField.la -all: $(LIBRARY) example +all: $(LIBRARY) $(LIBRARY): $(OBJ) - ar rs $(LIBRARY) $? + $(LIBTOOL) --mode=link $(CXX) -rpath $(PREFIX)/lib -rpath $(QTDIR)/lib -version-info 6:0 -o $(LIBRARY) $(OBJ:.o=.lo) example: example.o moc_example.o $(LIBRARY) @@ -96,9 +96,6 @@ moc $*.h -o moc_$*.cpp -QwSpriteField-%.o: QwSpriteField-%.cpp - $(COMPILE.cc) QwSpriteField-$*.cpp $(OUTPUT_OPTION) - %.o: %.cpp - $(COMPILE.cc) $< $(OUTPUT_OPTION) + $(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) -c $< clean: @@ -113,5 +110,5 @@ @echo "Making file $@ automatically." touch Dependencies - make depend + ${MAKE} depend include Dependencies