$NetBSD: patch-ae,v 1.9 2003/02/05 23:13:10 dmcmahill Exp $

--- src/Makefile.in.orig	Wed Jun 13 04:57:02 2001
+++ src/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_OPENGL) $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS_X11) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) $(QT_CXXFLAGS_OPT)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) $(QT_CFLAGS_OPT)
@@ -12,9 +12,12 @@ LIBS	=	$(SUBLIBS) $(SYSCONF_LIBS_OPENGL)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
+CFLAGS_NOOPT   = $(CFLAGS:-O%=)
+CXXFLAGS_NOOPT = $(CXXFLAGS:-O%=)
+
 ####### Target
 
-DESTDIR = ../lib/
+DESTDIR =
 VER_MAJ = 2
 VER_MIN = 3
 VER_PATCH = 1
@@ -372,25 +375,18 @@ OBJECTS_opengl = opengl/qgl.o \
 		opengl/qgl_x11.o \
 		opengl/moc_qgl.o
 
-
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+	@cd `dirname $@` && $(CXX) -c $(CXXFLAGS) `basename $<`
 
 .cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+	@cd `dirname $@` && $(CXX) -c $(CXXFLAGS_NOOPT) `basename $<`
 
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+.cpp.cc:
+	cp -f $< $@
 
 ####### Build rules
 
@@ -398,7 +394,7 @@ OBJECTS_opengl = opengl/qgl.o \
 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)
 
@@ -13114,4 +13110,43 @@ opengl/qgl_x11.o: opengl/qgl_x11.cpp \
 		tools/qgdict.h \
 		kernel/qtranslator.h \
 		tools/qintdict.h
+
+# problem files  -- compile with no optimization
+ifeq (${MACHINE_ARCH},alpha)
+
+kernel/moc_qnetworkprotocol.o: kernel/moc_qnetworkprotocol.cc
+kernel/moc_qurloperator.o: kernel/moc_qurloperator.cc
+kernel/moc_qwidget.o: kernel/moc_qwidget.cc
+widgets/moc_qbutton.o: widgets/moc_qbutton.cc
+widgets/moc_qcombobox.o: widgets/moc_qcombobox.cc
+widgets/moc_qdial.o: widgets/moc_qdial.cc
+widgets/moc_qframe.o: widgets/moc_qframe.cc
+widgets/moc_qgroupbox.o: widgets/moc_qgroupbox.cc
+widgets/moc_qheader.o: widgets/moc_qheader.cc
+widgets/moc_qlabel.o: widgets/moc_qlabel.cc
+widgets/moc_qlcdnumber.o: widgets/moc_qlcdnumber.cc
+widgets/moc_qlineedit.o: widgets/moc_qlineedit.cc
+widgets/moc_qlistbox.o: widgets/moc_qlistbox.cc
+widgets/moc_qlistview.o: widgets/moc_qlistview.cc
+widgets/moc_qmainwindow.o: widgets/moc_qmainwindow.cc
+widgets/moc_qmultilineedit.o: widgets/moc_qmultilineedit.cc
+widgets/moc_qprogressbar.o: widgets/moc_qprogressbar.cc
+widgets/moc_qpushbutton.o: widgets/moc_qpushbutton.cc
+widgets/moc_qscrollbar.o: widgets/moc_qscrollbar.cc
+widgets/moc_qscrollview.o: widgets/moc_qscrollview.cc
+widgets/moc_qslider.o: widgets/moc_qslider.cc
+widgets/moc_qspinbox.o: widgets/moc_qspinbox.cc
+widgets/moc_qtabwidget.o: widgets/moc_qtabwidget.cc
+widgets/moc_qtextview.o: widgets/moc_qtextview.cc
+widgets/moc_qtoolbar.o: widgets/moc_qtoolbar.cc
+widgets/moc_qtoolbutton.o: widgets/moc_qtoolbutton.cc
+widgets/moc_qaction.o: widgets/moc_qaction.cc
+dialogs/moc_qfiledialog.o: dialogs/moc_qfiledialog.cc
+dialogs/moc_qmessagebox.o: dialogs/moc_qmessagebox.cc
+dialogs/moc_qprogressdialog.o: dialogs/moc_qprogressdialog.cc
+dialogs/moc_qprintdialog.o: dialogs/moc_qprintdialog.cc
+iconview/moc_qiconview.o: iconview/moc_qiconview.cc
+table/moc_qtable.o: table/moc_qtable.cc
+
+endif