--- configs/freebsd-g++-shared Sun Sep 10 18:44:24 2000 +++ configs/freebsd-g++-shared.new Sun Sep 10 18:44:53 2000 @@ -21,7 +21,7 @@ SYSCONF_LIBS_X11 = -lXext -lX11 -lm # Qt, Qt+OpenGL SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib -SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) +SYSCONF_LIBS_QT = -lqt2$(QT_THREAD_SUFFIX) SYSCONF_LIBS_QT_OPENGL = # OpenGL SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib @@ -44,7 +44,7 @@ SYSCONF_LIBS_THREAD = # Meta-object compiler -SYSCONF_MOC = $(QTDIR)/bin/moc +SYSCONF_MOC = $(QTDIR)/bin/moc2 # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic @@ -55,16 +55,14 @@ # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) # SYSCONF_LINK_SHLIB = g++ -SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) +SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \ $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ $(OBJECTS) $(OBJMOC) $(LIBS) && \ mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ cd $(DESTDIR) && \ - rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ - ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ - ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \ - ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) + rm -f lib$(TARGET).so;\ + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so # Linking static libraries # - Build the $(TARGET) library, eg. lib$(TARGET).a