Fix dependencies

Fix "make GRASS_LIBRARY_TYPE=stlib"


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@50759 15284696-431f-4ddb-bdfa-cd5b030d7da7

aclocal.m4

@@ -410,19 +410,13 @@ AC_DEFUN([SC_ENABLE_SHARED], [
     if test "$shared_ok" = "yes" ; then
 	AC_MSG_RESULT([shared])
 	SHARED_BUILD=1
-	GRASS_LIB_PREFIX='$(SHLIB_PREFIX)'
-	GRASS_LIB_SUFFIX='$(SHLIB_SUFFIX)'
 	GRASS_LIBRARY_TYPE='shlib'
     else
 	AC_MSG_RESULT([static])
 	SHARED_BUILD=0
 	AC_DEFINE(STATIC_BUILD)
-	GRASS_LIB_PREFIX='$(STLIB_PREFIX)'
-	GRASS_LIB_SUFFIX='$(STLIB_SUFFIX)'
 	GRASS_LIBRARY_TYPE='stlib'
     fi
-    AC_SUBST(GRASS_LIB_PREFIX)
-    AC_SUBST(GRASS_LIB_SUFFIX)
     AC_SUBST(GRASS_LIBRARY_TYPE)
 ])
 

display/d.mon/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.mon
 
-LIBES = $(DISPLAYLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
+LIBES = $(GISLIB)
+DEPENDENCIES= $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

include/Make/Grass.make

@@ -216,9 +216,9 @@ RLIDEPS          = $(RASTERLIB) $(GISLIB) $(MATHLIB)
 ROWIODEPS        = $(GISLIB)
 RTREEDEPS        = $(GISLIB) $(MATHLIB)
 SEGMENTDEPS      = $(GISLIB)
-#SIMDEPS          = $(VECTLIB) $(BITMAPLIB) $(GMATHLIB) $(LINKMLIB) $(SITESLIB) $(DBMILIB) $(GISLIB)
+SIMDEPS          = $(VECTLIB) $(RASTERLIB)
 SITESDEPS        = $(VECTORLIB) $(DBMILIB) $(GISLIB) $(DATETIMELIB)
-STATSDEPS        = $(RASTERLIB) $(GISLIB) $(MATHLIB)	# NB: doesn't use libgis directly
+STATSDEPS        = $(RASTERLIB) $(GISLIB) $(MATHLIB)
 SYMBDEPS         = $(GISLIB) $(MATHLIB)
 TEMPORALDEPS     = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
 VECTORDEPS       = $(DBMILIB) $(GRAPHLIB) $(DIG2LIB) $(LINKMLIB) $(RTREELIB) $(GISLIB) $(GEOSLIBS) $(GDALLIBS) $(MATHLIB) $(BTREE2LIB) $(GPROJLIB) $(RASTERDEP) $(PQLIBPATH) $(PQLIB)
@@ -254,6 +254,11 @@ endif
 
 ifeq ($(GRASS_LIBRARY_TYPE),stlib)
 NEED_DEPS = 1
+LIB_PREFIX = $(STLIB_PREFIX)
+LIB_SUFFIX = $(STLIB_SUFFIX)
+else
+LIB_PREFIX = $(SHLIB_PREFIX)
+LIB_SUFFIX = $(SHLIB_SUFFIX)
 endif
 
 define lib_rules

include/Make/Platform.make.in

@@ -56,8 +56,6 @@ LD_SEARCH_FLAGS     = @LD_SEARCH_FLAGS@
 LD_LIBRARY_PATH_VAR = @LD_LIBRARY_PATH_VAR@
 
 #generate static (ST) or shared (SH)
-LIB_PREFIX          = @GRASS_LIB_PREFIX@
-LIB_SUFFIX          = @GRASS_LIB_SUFFIX@
 GRASS_LIBRARY_TYPE  = @GRASS_LIBRARY_TYPE@
 
 #static libs:

lib/python/ctypes/Makefile

@@ -13,7 +13,7 @@ MODULES = date gis raster gmath proj imagery vector display stats \
 	dbmi raster3d arraystats cluster vedit ogsf nviz
 
 date_LIBS       = $(DATETIMELIB)
-gis_LIBS      = $(GISLIB)
+gis_LIBS        = $(GISLIB)
 raster_LIBS     = $(RASTERLIB)
 gmath_LIBS      = $(GMATHLIB)
 proj_LIBS       = $(GPROJLIB)
@@ -69,10 +69,13 @@ PYFILES  := $(patsubst %,$(DSTDIR)/%.py,$(MODULES) __init__ ctypes_preamble ctyp
 PYCFILES  := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES) __init__ ctypes_preamble ctypes_loader)
 LPYFILES := $(patsubst %,$(OBJDIR)/%.py,$(MODULES))
 
-ifneq ($(strip $(CTYPESGEN)),)
+ifeq ($(strip $(GRASS_LIBRARY_TYPE)),shlib)
 default:
 	$(MAKE) $(DSTDIR)
 	$(MAKE) $(LPYFILES) $(PYFILES) $(PYCFILES)
+else
+default:
+	@echo "Cannot build Python wrappers for static libraries" >&2
 endif
 
 $(DSTDIR)/__init__.py: __init__.py | $(DSTDIR)

misc/m.nviz.image/Makefile

@@ -2,16 +2,6 @@ MODULE_TOPDIR = ../..
 
 PGM = m.nviz.image
 
-ifeq ($(OPENGL_X11),1)
-OGL_LIBS := $(OPENGLULIB) $(OPENGLLIB) $(XLIBPATH) $(XLIB) -lXmu -lXext $(XEXTRALIBS) $(MATHLIB)
-endif
-ifeq ($(OPENGL_WINDOWS),1)
-OGL_LIBS := $(OPENGLULIB) $(OPENGLLIB) -lgdi32 $(MATHLIB)
-endif
-ifeq ($(OPENGL_AQUA),1)
-OGL_LIBS := $(OPENGLULIB) $(OPENGLLIB) $(MATHLIB)
-endif
-
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(INC) \
 	$(TIFFINCPATH) $(DSPINC) \
@@ -22,10 +12,8 @@ ifeq ($(OPENGL_X11),1)
 EXTRA_CFLAGS += $(XCFLAGS)
 endif
 
-EXTRA_LDFLAGS = $(OGL_LIBS)
-
-LIBES = $(GISLIB) $(OGSFLIB) $(NVIZLIB) $(RASTER3DLIB) $(VECTORLIB) $(DBMILIB)
-DEPENDENCIES = $(GISDEP) $(NVIZDEP) $(VECTORDEP) $(DBMIDEP)
+LIBES = $(GISLIB) $(OGSFLIB) $(NVIZLIB) $(VECTORLIB) $(DBMILIB)
+DEPENDENCIES = $(GISDEP) $(OGSFDEP) $(NVIZDEP) $(VECTORDEP) $(DBMIDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/simwe/r.sim.sediment/Makefile

@@ -4,11 +4,8 @@ PGM=r.sim.sediment
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIBES     = $(SIMLIB) $(BITMAPLIB) $(LINKMLIB) \
-            $(SITESLIB) $(VECTLIB) $(VECTLIB_REAL) \
-            $(DBMILIB) $(GISLIB) $(DATETIMELIB) $(GMATHLIB) $(RASTERLIB)
-DEPENDENCIES = $(SIMDEP) $(BITMAPDEP) $(LINKMDEP) \
-            $(VECTDEP) $(DBMIDEP) $(GISDEP) $(DATETIMEDEP) $(GMATHDEP) $(RASTERDEP)
+LIBES     = $(SIMLIB) $(GMATHLIB) $(GISLIB)
+DEPENDENCIES = $(SIMDEP) $(GMATHDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = -I ../simlib $(VECT_CFLAGS) 
 

raster/simwe/r.sim.water/Makefile

@@ -4,10 +4,8 @@ PGM=r.sim.water
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIBES     = $(SIMLIB) $(BITMAPLIB) $(LINKMLIB) \
-            $(SITESLIB) $(VECTLIB) $(VECTLIB_REAL) $(DBMILIB) $(GISLIB) $(DATETIMELIB) $(GMATHLIB) $(RASTERLIB)
-DEPENDENCIES = $(SIMDEP) $(BITMAPDEP) $(LINKMDEP) \
-            $(VECTDEP) $(DBMIDEP) $(GISDEP) $(DATETIMEDEP) $(GMATHDEP) $(RASTERDEP)
+LIBES     = $(SIMLIB) $(GMATHLIB) $(GISLIB)
+DEPENDENCIES = $(SIMDEP) $(GMATHDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = -I ../simlib $(VECT_CFLAGS) 
 

raster3d/r3.mask/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM=r3.mask
 
-LIBES = $(GPDELIB) $(RASTER3DLIB) $(GISLIB)
-DEPENDENCIES = $(GPDEDEP) $(RASTER3DDEP) $(GISDEP)
+LIBES = $(RASTER3DLIB) $(GISLIB)
+DEPENDENCIES = $(RASTER3DDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster3d/r3.mkdspf/Makefile

@@ -8,7 +8,7 @@ LDIR = ../../lib/dspf
 EXTRA_CFLAGS    =       -I$(LDIR)
 # -I$(INCLUDE_DIR)
 
-LIBES = $(DSPFLIB) $(RASTER3DLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
-DEPENDENCIES = $(DSPFDEP) $(RASTER3DDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DSPFLIB) $(RASTER3DLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(DSPFDEP) $(RASTER3DDEP) $(GISDEP)
 
 default: cmd

raster3d/r3.null/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM=r3.null
 
-LIBES = $(GPDELIB) $(RASTER3DLIB) $(GISLIB)
-DEPENDENCIES = $(GPDEDEP) $(RASTER3DDEP) $(GISDEP)
+LIBES = $(RASTER3DLIB) $(GISLIB)
+DEPENDENCIES = $(RASTER3DDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster3d/r3.timestamp/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM=r3.timestamp
 
-LIBES = $(RASTER3DLIB) $(GISLIB)
-DEPENDENCIES = $(RASTER3DDEP) $(GISDEP)
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

vector/v.external.out/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM=v.external.out
 
-LIBES = $(VECTORLIB) $(GISLIB) $(GDALLIBS)
-DEPENDENCIES = $(VECTORDEP) $(GISDEP)
+LIBES = $(GISLIB) $(GDALLIBS)
+DEPENDENCIES = $(GISDEP)
 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)

vector/v.lidar.correction/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = v.lidar.correction
 
-LIBES = $(LIDARLIB) $(GMATHLIB) $(VECTORLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB) $(SEGMENTLIB) $(MATHLIB)
-DEPENDENCIES = $(LIDARDEP) $(GMATHDEP) $(VECTORDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP) $(SEGMENTDEP)
+LIBES = $(LIDARLIB) $(GMATHLIB) $(VECTORLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB) $(MATHLIB)
+DEPENDENCIES = $(LIDARDEP) $(GMATHDEP) $(VECTORDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 
@@ -11,4 +11,3 @@ include $(MODULE_TOPDIR)/include/Make/Module.make
 
 default: cmd
 
- 

vector/v.lidar.edgedetection/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = v.lidar.edgedetection
 
-LIBES = $(LIDARLIB) $(GMATHLIB) $(VECTORLIB) $(DBMILIB) $(SEGMENTLIB) $(GISLIB) $(MATHLIB)
-DEPENDENCIES = $(LIDARDEP) $(GMATHDEP) $(VECTORDEP) $(DBMIDEP) $(SEGMENTDEP) $(GISDEP)
+LIBES = $(LIDARLIB) $(GMATHLIB) $(VECTORLIB) $(DBMILIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(LIDARDEP) $(GMATHDEP) $(VECTORDEP) $(DBMIDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS) 
 
@@ -11,4 +11,3 @@ include $(MODULE_TOPDIR)/include/Make/Module.make
 
 default: cmd
 
- 

vector/v.lidar.growing/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = v.lidar.growing
 
-LIBES = $(GMATHLIB) $(VECTORLIB) $(DBMILIB) $(RASTERLIB) $(SEGMENTLIB) $(GISLIB)
-DEPENDENCIES = $(GMATHDEP) $(VECTORDEP) $(DBMIDEP) $(RASTERDEP) $(SEGMENTDEP) $(GISDEP)
+LIBES = $(GMATHLIB) $(VECTORLIB) $(DBMILIB) $(RASTERLIB) $(GISLIB)
+DEPENDENCIES = $(GMATHDEP) $(VECTORDEP) $(DBMIDEP) $(RASTERDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 
@@ -11,4 +11,3 @@ include $(MODULE_TOPDIR)/include/Make/Module.make
 
 default: cmd
 
- 

vector/v.outlier/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = v.outlier
 
-LIBES = $(LIDARLIB) $(GMATHLIB) $(VECTORLIB) $(DBMILIB) $(SEGMENTLIB) $(GISLIB) $(MATHLIB)
-DEPENDENCIES = $(LIDARDEP) $(GMATHDEP) $(VECTORDEP) $(DBMIDEP) $(SEGMENTDEP) $(GISDEP)
+LIBES = $(LIDARLIB) $(GMATHLIB) $(VECTORLIB) $(DBMILIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(LIDARDEP) $(GMATHDEP) $(VECTORDEP) $(DBMIDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

vector/v.timestamp/Makefile

@@ -2,10 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = v.timestamp
 
-LIBES = $(VECTORLIB) $(DBMILIB) $(GISLIB)
-DEPENDENCIES = $(VECTORDEP) $(DBMIDEP) $(GISDEP)
-EXTRA_INC = $(VECT_INC)
-EXTRA_CFLAGS = $(VECT_CFLAGS)
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

vector/v.timestamp/main.c

@@ -18,7 +18,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/vector.h>
 #include <grass/glocale.h>
 
 int main(int argc, char *argv[])

visualization/nviz/src/Makefile

@@ -40,9 +40,8 @@ EXTRA_LDFLAGS=$(TCLTKLIBPATH)
 EXTRA_LIBS = $(TCLTKLIBS) $(OGL_LIBS)
 
 LIBES = $(SURFLIB) \
-	$(BITMAPLIB) $(LINKMLIB) $(VECTLIB) $(SITESLIB) $(FORMLIB) $(DBMILIB) \
-	$(RASTER3DLIB) $(GISLIB) \
-	$(DATETIMELIB) $(TIFFLIBPATH) $(TIFFLIB)
+	$(VECTLIB) $(FORMLIB) $(DBMILIB) \
+	$(GISLIB)
 
 DEPENDENCIES = $(VECTDEP) $(BITMAPDEP) $(LINKMDEP) $(FORMDEP) $(DBMIDEP) $(GISDEP)
 

visualization/wximgview/Makefile

@@ -4,8 +4,8 @@ PGM = wximgview
 
 EXTRA_CFLAGS = $(WXWIDGETSCXXFLAGS) -DWXINTL_NO_GETTEXT_MACRO
 
-LIBES = $(RASTERLIB) $(GISLIB) $(WXWIDGETSLIB)
-DEPENDENCIES = $(RASTERDEP) $(GISDEP)
+LIBES = $(GISLIB) $(WXWIDGETSLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make