1999-05-28 14:10:19 -04:00
|
|
|
--- configs/openbsd-g++-shared.orig Fri Feb 26 12:02:08 1999
|
|
|
|
|
+++ configs/openbsd-g++-shared Fri May 28 12:25:19 1999
|
1999-03-06 21:25:55 -05:00
|
|
|
@@ -1,30 +1,30 @@
|
|
|
|
|
# Compiling
|
1999-05-27 16:13:05 -04:00
|
|
|
-SYSCONF_CXX = g++
|
|
|
|
|
+SYSCONF_CXX = $(CX)
|
1999-03-06 21:25:55 -05:00
|
|
|
|
|
|
|
|
# Compiling with support libraries
|
1999-05-27 16:13:05 -04:00
|
|
|
-SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
|
|
|
|
|
+SYSCONF_CXXFLAGS_X11 = -I$(X11BASE)/include
|
|
|
|
|
SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
|
|
|
|
|
-SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include
|
|
|
|
|
+SYSCONF_CXXFLAGS_OPENGL = -I$(X11BASE)/include
|
1999-03-06 21:25:55 -05:00
|
|
|
|
|
|
|
|
# Compiline YACC output
|
1999-05-27 16:13:05 -04:00
|
|
|
SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
|
1999-03-06 21:25:55 -05:00
|
|
|
|
|
|
|
|
# Linking with support libraries
|
|
|
|
|
# X11
|
|
|
|
|
-SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
|
|
|
|
|
+SYSCONF_LFLAGS_X11 = -L$(X11BASE)/lib
|
|
|
|
|
SYSCONF_LIBS_X11 = -lX11 -lXext
|
|
|
|
|
# Qt, Qt+OpenGL
|
|
|
|
|
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
|
|
|
|
|
SYSCONF_LIBS_QT = -lqt
|
|
|
|
|
SYSCONF_LIBS_QT_OPENGL = -lqgl
|
|
|
|
|
# OpenGL
|
|
|
|
|
-SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
|
|
|
|
|
+SYSCONF_LFLAGS_OPENGL = -L$(X11BASE)/lib
|
|
|
|
|
SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu -lXext -lm
|
|
|
|
|
# Yacc
|
|
|
|
|
SYSCONF_LIBS_YACC =
|
|
|
|
|
|
|
|
|
|
# Linking applications
|
|
|
|
|
-SYSCONF_LINK = g++
|
1999-05-27 16:13:05 -04:00
|
|
|
+SYSCONF_LINK = $(CX)
|
1999-03-06 21:25:55 -05:00
|
|
|
SYSCONF_LFLAGS =
|
|
|
|
|
SYSCONF_LIBS =
|
|
|
|
|
|
1999-05-28 14:10:19 -04:00
|
|
|
@@ -41,7 +41,7 @@
|
|
|
|
|
#
|
|
|
|
|
SYSCONF_LINK_SHLIB = ld
|
|
|
|
|
SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
|
|
|
|
|
-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)
|
|
|
|
|
+SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) $(OBJECTS) $(OBJMOC) $(LIBS)
|
|
|
|
|
|
|
|
|
|
# Linking static libraries
|
|
|
|
|
# - Build the $(TARGET) library, eg. lib$(TARGET).a
|
1999-05-16 00:50:25 -04:00
|
|
|
@@ -53,11 +53,11 @@
|
1999-05-27 16:13:05 -04:00
|
|
|
$(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) ; \
|
1999-05-16 00:50:25 -04:00
|
|
|
ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
|
|
|
|
|
# Compiling application source
|
1999-05-27 16:13:05 -04:00
|
|
|
-SYSCONF_CXXFLAGS = -O2 -fno-strength-reduce
|
|
|
|
|
+SYSCONF_CXXFLAGS = $(CXFLAGS) -fno-strength-reduce
|
1999-05-16 00:50:25 -04:00
|
|
|
# Compiling library source
|
1999-05-27 16:13:05 -04:00
|
|
|
-SYSCONF_CXXFLAGS_LIB = -O2 -fno-strength-reduce -fPIC
|
|
|
|
|
+SYSCONF_CXXFLAGS_LIB = $(CXFLAGS) -fno-strength-reduce -fPIC
|
1999-05-16 00:50:25 -04:00
|
|
|
# Compiling shared-object source
|
1999-05-27 16:13:05 -04:00
|
|
|
-SYSCONF_CXXFLAGS_SHOBJ = -O2 -fno-strength-reduce -fPIC
|
|
|
|
|
+SYSCONF_CXXFLAGS_SHOBJ = $(CXFLAGS) -fno-strength-reduce -fPIC
|
1999-05-16 00:50:25 -04:00
|
|
|
# Default link type (stati linking is still be used where required)
|
|
|
|
|
SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED)
|
|
|
|
|
SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED)
|
