Makefiles: removed definitions for "GL" library (VOGL / MESA / OpenGL)
These have been moved to `stx:libview` to move it closer to the code that
uses it.
--- a/makelib/config-linux-gnu.make Wed Sep 06 14:38:30 2017 +0200
+++ b/makelib/config-linux-gnu.make Thu Sep 14 12:52:32 2017 +0100
@@ -89,7 +89,7 @@
FORCE_LINK_LIBRUN=1
# mhm - these should now only be in libview!
-LIBVIEW_EXTRA_TARGETS=$(WORKSTAT1).so $(WORKSTAT2).so
+
ARCH_LIBSNMP=$(TOP)/libsnmp
ARCH_CLASSLIBDIRS=$(ARCH_LIBSNMP)
--- a/makelib/config.make Wed Sep 06 14:38:30 2017 +0200
+++ b/makelib/config.make Thu Sep 14 12:52:32 2017 +0100
@@ -879,94 +879,8 @@
#MSQL_INCLUDE_DIR=/usr/local/include
#MSQL_LIB_DIR=/usr/local/lib
-
# --------------------------------------------------
-# the VGL library
-#
-# has to be explicitely added in the defines file,
-# by defining
-# EXTRA_LIBS= ... $(LIB_VOGL) ...
-# and
-# CC_GL_FLAGS= ... $(CC_VGL_FLAGS) ...
-#
-# Late note: these defs are now all in the PACKS definitions
-#
-VOGL_DIR =$(SUPPORT_DIR)/VGL/vogl/src
-LIB_VOGL =$(VOGL_DIR)/libvogl.a
-LIB_VOGL_SO =$(VOGL_DIR)/libvogl$(SO_NAME)
-MAKEFILE_VOGL=Makefile.$(MAKEFILE_EXTENSION)
-CC_VOGL_INCLUDE=-I$(VOGL_DIR)
-CC_VOGL_FLAGS =-DVGL $(CC_VOGL_INCLUDE)
-
-#
-# only redefined for systems which have a real GL (SGI, AIX)
-# or have an openGL (mesa, openGL)
-#
-LIB_GL=$(LIB_VOGL)
-LIB_GL_TARGET=libvogl
-
-#
-# the mesa (openGL) library (optional)
-#
-MESA_VSN=3.0
-MESA_VSNDEF=3_0
-
-MESA_REL_DIR =Mesa-$(MESA_VSN)
-
-MESA_DIR =$(SUPPORT_DIR)/MESA/$(MESA_REL_DIR)
-MESA_LIB_DIR =$(MESA_DIR)/lib
-LIB_MESA =$(MESA_LIB_DIR)/libMesaGL.a
-LIB_MESA_SO =$(MESA_LIB_DIR)/libMesaGL$(SO_NAME)
-CC_MESA_INCLUDE=-I$(MESA_DIR)/include
-CC_MESA_FLAGS=-DMESA -DMESA$(MESA_VSNDEF) $(CC_MESA_INCLUDE)
-MAKEFILE_MESA=Makefile
-
-#
-# the next two should be redefined in architecture-specific
-# config files of systems which have true GL/openGL (i.e. SGI)
-# or have those includes somewhere else.
-#
-# the default here is to use VGL/MESA
-#
-# CC_GL_FLAGS=$(CC_VOGL_FLAGS)
-CC_GL_FLAGS=-DOPENGL $(shell pkg-config --cflags gl)
-LIB_GL=$(shell pkg-config --libs gl)
-
-#CC_OPENGL_FLAGS=$(CC_MESA_FLAGS)
-
-# the next one should be defined in a packs file
-# to choose between GL/VGL and OpenGL/MESA
-#
-# for GL/VOGL:
-# CC_3D_FLAGS=$(CC_GL_FLAGS)
-# for openGL/MESA:
-# CC_3D_FLAGS=$(CC_OPENGL_FLAGS)
-#
-
-
-
-# Systems which have true GL/OpenGL, mnay redefine the above
-# for true GL:
-# CC_GL_FLAGS=-DGLX -I<gl-include-path-if-any>
-#
-# for true OpenGL:
-# CC_OPENGL_FLAGS=-DOPENGL -I<openGL-include-path-if-any>
-
-#
-# redefine this to the Makefile target in Mesa/Makefile
-# for your machine
-MAKE_MESA_TARGET=$(ARCH)
-
-#
-# only redefined for systems which have a real openGL (SGI, NT)
-#
-LIB_OPENGL=$(LIB_MESA)
-LIB_OPENGL_TARGET=libmesa
-
-OPENGL_INCLUDE=
-
-#
-# a netsnmp library
+# The netsnmp library
#
# if already in /usr/lib:
# DYNAMIC_LINK_LIB_NETSNMP=-lnetsnmp
@@ -1061,7 +975,7 @@
#
# extra targets made in support (old: librun) / libview
#
-SUPPORT_EXTRA_TARGETS=$(OPTIONAL_LIBGL_TARGET) $(OPTIONAL_LIBDL_TARGET)
+SUPPORT_EXTRA_TARGETS=$(OPTIONAL_LIBDL_TARGET)
LIBVIEW_EXTRA_TARGETS=
@@ -1111,11 +1025,6 @@
# The concrete libs (for example gl vs. vgl) are set in the architecture
# specific configurations.
-OPTIONAL_LIBGL_TARGET=
-OPTIONAL_GL_LIB=
-STATIC_OPTIONAL_GL_LIB=$(OPTIONAL_GL_LIB)
-OPTIONAL_LINK_GL_LIB=
-
OPTIONAL_LIBOPENGL_TARGET=
OPTIONAL_OPENGL_LIB=
STATIC_OPTIONAL_OPENGL_LIB=$(OPTIONAL_OPENGL_LIB)
@@ -1125,38 +1034,6 @@
STATIC_OPTIONAL_DL_LIB=$(OPTIONAL_DL_LIB)
OPTIONAL_LINK_DL_LIB=
-#
-# to get GL/VGL, add in a packageList:
-# OPTIONAL_LIBGL_TARGET=$(LIB_GL_TARGET)
-# OPTIONAL_GL_LIB=$(LIB_GL)
-#
-# in addition, you have to decide which gl to use;
-# for vogl, add to the architecture config file:
-# LIB_GL_TARGET=$(LIB_VOGL_TARGET)
-# LIB_GL=$(LIB_VOGL)
-# for a real gl, add in an architecture config file:
-# LIB_GL_TARGET=
-# LIB_GL=-lgl_s
-
-OPTIONAL_LIBGL_TARGET=$(LIB_GL_TARGET)
-OPTIONAL_GL_LIB=$(LIB_GL)
-OPTIONAL_LINK_GL_LIB=$(LINK_LIB_GL)
-OPTIONAL_GL_DEFINE=$(CC_GL_DEFINE)
-CC_3D_FLAGS=$(CC_GL_FLAGS)
-
-#
-# to get openGL/mesa, add in a packageList:
-# OPTIONAL_LIBOPENGL_TARGET=$(LIB_OPENGL_TARGET)
-# OPTIONAL_OPENGL_LIB=$(LIB_OPENGL)
-# OPTIONAL_LINK_OPENGL_LIB=$(LINK_LIB_OPENGL)
-#
-# in addition, you have to decide which openGL to use;
-# for mesa, add to the architecture config file:
-# LIB_OPENGL_TARGET=$(LIB_MESA_TARGET)
-# LIB_OPENGL=$(LIB_MESA)
-# for a real gl, add in an architecture config file:
-# LIB_GL_TARGET=
-# LIB_GL=-lopenGL_s
# to get an ObjectFileLoader,
# you have to decide which dynamic load facility to use;