$NetBSD: patch-ai,v 1.1.1.1 2000/10/19 07:41:16 skrll Exp $ --- tools/designer/util/Makefile.in.orig Tue Oct 17 12:36:29 2000 +++ tools/designer/util/Makefile.in @@ -2,7 +2,7 @@ ####### Compiler, tools and options -CXX = $(SYSCONF_CXX) $(QT_CXX_MT) +CXX = $(SYSCONF_CXX_LIB) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) @@ -14,7 +14,7 @@ ####### Target -DESTDIR = $(QTDIR)/lib/ +DESTDIR = VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 @@ -40,19 +40,7 @@ .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< + @cd `dirname $@` && $(CXX) -c $(CXXFLAGS) `basename $<` ####### Build rules @@ -60,7 +48,7 @@ all: $(DESTDIR)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) - $(SYSCONF_LINK_LIB) + $(SYSCONF_LINK_LIB) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL) moc: $(SRCMOC)