$NetBSD: patch-aa,v 1.4 1998/12/29 19:34:48 tron Exp $ --- configs/netbsd-g++-static.orig Tue Nov 17 15:19:08 1998 +++ configs/netbsd-g++-static Tue Dec 29 20:11:13 1998 @@ -2,9 +2,9 @@ SYSCONF_CC = g++ # Compiling with support libraries -SYSCONF_CFLAGS_X11 = -I/usr/X11R6/include +SYSCONF_CFLAGS_X11 = -I$(X11BASE)/include SYSCONF_CFLAGS_QT = -I$(QTDIR)/include -SYSCONF_CFLAGS_OPENGL = -I/usr/X11R6/include +SYSCONF_CFLAGS_OPENGL = -I$(X11BASE)/include # Compiline YACC output SYSCONF_CFLAGS_YACC = -Wno-unused -Wno-parentheses @@ -47,14 +47,14 @@ # - Build the $(TARGET) library, eg. lib$(TARGET).a # - Place target in $(DESTDIR) - which has a trailing / # -SYSCONF_AR = ar cqs -SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a +SYSCONF_AR = $(LIBTOOL) $(SYSCONF_CC) -rpath $(PREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) -o +SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).la SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ - $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) + $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) # Compiling application source SYSCONF_CFLAGS = -O2 -fno-strength-reduce # Compiling library source -SYSCONF_CFLAGS_LIB = -O2 -fno-strength-reduce -fPIC +SYSCONF_CFLAGS_LIB = # Compiling shared-object source SYSCONF_CFLAGS_SHOBJ = -O2 -fno-strength-reduce -fPIC SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC)