1 --- ./configs/netbsd-g++-static.orig Wed Apr 12 14:26:47 2000
2 +++ ./configs/netbsd-g++-static Wed Jun 14 22:39:32 2000
7 +SYSCONF_CXX_LIB = $(LIBTOOL) --mode=compile g++
9 # Compiling with support libraries
10 SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
13 # Linking with support libraries
15 -SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
16 +SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib
17 SYSCONF_LIBS_X11 = -lXext -lX11 -lm
19 -SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
20 -SYSCONF_LIBS_QT = -lqt
22 +SYSCONF_LIBS_QT = $(QTDIR)/src/libqt.la
23 SYSCONF_LIBS_QT_OPENGL = -lqgl
25 SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
29 # Linking applications
31 +SYSCONF_LINK = $(LIBTOOL) --mode=link g++
35 -# Link flags shared objects
36 -SYSCONF_LFLAGS_SHOBJ = -Bshareable
38 # Meta-object compiler
39 SYSCONF_MOC = $(QTDIR)/bin/moc
41 -# Linking shared libraries
42 -# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.0.1
43 -# - Place target in $(DESTDIR) - which has a trailing /
44 -# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
46 -SYSCONF_LINK_SHLIB = ld
47 -SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
48 -SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS)
50 -# Linking static libraries
51 +# Linking libtool libraries
52 # - Build the $(TARGET) library, eg. lib$(TARGET).a
53 # - Place target in $(DESTDIR) - which has a trailing /
56 -SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
57 -SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
58 - $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
59 +SYSCONF_LINK_TARGET = lib$(TARGET).la
60 +SYSCONF_LINK_LIB = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET) ; \
61 + $(SYSCONF_LINK) -rpath $(QTPREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) \
62 + -o $(SYSCONF_LINK_TARGET) $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo)
63 # Compiling application source
64 SYSCONF_CXXFLAGS = -O2
66 # Compiling library source
67 -SYSCONF_CXXFLAGS_LIB = -fPIC
68 -SYSCONF_CFLAGS_LIB = -fPIC
69 +SYSCONF_CXXFLAGS_LIB =
71 # Compiling shared-object source
72 -SYSCONF_CXXFLAGS_SHOBJ = -fPIC
73 -SYSCONF_CFLAGS_SHOBJ = -fPIC
74 -SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC)
75 -SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC)
76 +SYSCONF_CXXFLAGS_SHOBJ =
77 +SYSCONF_CFLAGS_SHOBJ =