ogdi-pic.patch

   1 --- ogdi-3.1.2/ogdi/c-api/makefile.orig 2001-04-19 05:29:31.000000000 +0000
   2 +++ ogdi-3.1.2/ogdi/c-api/makefile      2004-01-23 15:51:14.000000000 +0000
   3 @@ -23,7 +23,7 @@
   4                 $(GRASS_INCLUDE) $(ZLIB_INCLUDE) $(PROJ_INCLUDE) \
   5                 $(EXPAT_INCLUDE)
   6
   7 -CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS)
   8 +CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS) $(SHLIB_CFLAGS)
   9
  10  LINK_LIBS= $(RPC_LINKLIB) $(ZLIB_LINKLIB) $(EXPAT_LINKLIB) $(WIN_LINKLIB) \
  11                 $(PROJ_STATICLIB) $(MATH_LINKLIB)
  12 --- ogdi-3.1.2/ogdi/datum_driver/canada/makefile.orig   2001-02-19 04:12:21.000000000 +0000
  13 +++ ogdi-3.1.2/ogdi/datum_driver/canada/makefile        2004-01-23 15:54:07.000000000 +0000
  14 @@ -17,7 +17,7 @@
  15  SOURCES = nadconv.c dtcanada.c
  16
  17  INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
  18 -CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS)
  19 +CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS) $(SHLIB_CFLAGS)
  20
  21  LINK_LIBS=
  22
  23 --- ogdi-3.1.2/ogdi/datum_driver/usa/makefile.orig      2001-02-19 04:12:21.000000000 +0000
  24 +++ ogdi-3.1.2/ogdi/datum_driver/usa/makefile   2004-01-23 15:57:44.000000000 +0000
  25 @@ -17,7 +17,7 @@
  26  SOURCES = dtusa.c
  27
  28  INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
  29 -CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS)
  30 +CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS) $(SHLIB_CFLAGS)
  31
  32  LINK_LIBS= $(PROJ_STATICLIB)
  33
  34 --- ogdi-3.1.2/ogdi/driver/adrg/makefile.orig   2001-06-22 16:37:50.000000000 +0000
  35 +++ ogdi-3.1.2/ogdi/driver/adrg/makefile        2004-01-23 16:00:08.000000000 +0000
  36 @@ -18,7 +18,7 @@
  37
  38  INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
  39
  40 -CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS)
  41 +CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS) $(SHLIB_CFLAGS)
  42
  43  LINK_LIBS= $(OGDI_LINKLIB) $(GLUTIL_STATICLIB)
  44
  45 --- ogdi-3.1.2/ogdi/driver/dted/makefile.orig   2001-02-19 04:12:21.000000000 +0000
  46 +++ ogdi-3.1.2/ogdi/driver/dted/makefile        2004-01-23 16:04:23.000000000 +0000
  47 @@ -17,7 +17,7 @@
  48  SOURCES = dted.c utils.c object.c
  49
  50  INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
  51 -CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS)
  52 +CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS) $(SHLIB_CFLAGS)
  53
  54  LINK_LIBS= $(OGDI_LINKLIB)  $(GLUTIL_STATICLIB)
  55
  56 --- ogdi-3.1.2/ogdi/driver/rpf/makefile.orig    2001-02-19 04:12:21.000000000 +0000
  57 +++ ogdi-3.1.2/ogdi/driver/rpf/makefile 2004-01-23 16:07:10.000000000 +0000
  58 @@ -19,7 +19,7 @@
  59  INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) \
  60            $(GRASS_INCLUDE) $(PROJ_INCLUDE)
  61
  62 -CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS)
  63 +CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS) $(SHLIB_CFLAGS)
  64
  65  LINK_LIBS= $(OGDI_LINKLIB) $(VPF_STATICLIB) $(GLUTIL_STATICLIB) $(WIN_LINKLIB) $(MATH_LINKLIB)
  66
  67 --- ogdi-3.1.2/ogdi/driver/vrf/makefile.orig    2001-06-20 21:49:31.000000000 +0000
  68 +++ ogdi-3.1.2/ogdi/driver/vrf/makefile 2004-01-23 16:09:30.000000000 +0000
  69 @@ -17,7 +17,7 @@
  70  SOURCES = vrf.c utils.c feature.c object.c open.c swq.c vrfswq.c
  71
  72  INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(VPF_INCLUDE) $(PROJ_INCLUDE) $(GLUTIL_INCLUDE)
  73 -CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS)
  74 +CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS) $(SHLIB_CFLAGS)
  75
  76  LINK_LIBS= $(OGDI_LINKLIB) $(WIN_LINKLIB) $(VPF_STATICLIB) $(MATH_LINKLIB)
  77
  78 --- ogdi-3.1.2/vpflib/makefile.orig     2001-02-20 04:25:20.000000000 +0000
  79 +++ ogdi-3.1.2/vpflib/makefile  2004-01-23 16:14:12.000000000 +0000
  80 @@ -30,7 +30,8 @@
  81
  82  INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(VPF_INCLUDE)
  83
  84 -CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS) $(UNIX_DEFINE) \
  85 +# static lib, but linked into shared module - needs PIC
  86 +CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS) $(UNIX_DEFINE) $(SHLIB_CFLAGS) \
  87         -DSYS_BIG_ENDIAN=$(BIG_ENDIAN)
  88
  89  include $(TOPDIR)/config/common.mak
  90 --- ogdi-3.1.2/ogdi/driver/skeleton/makefile.orig       2001-02-19 04:12:21.000000000 +0000
  91 +++ ogdi-3.1.2/ogdi/driver/skeleton/makefile    2004-01-23 16:16:58.000000000 +0000
  92 @@ -18,7 +18,7 @@
  93
  94  INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(GLUTIL_INCLUDE) $(PROJ_INCLUDE)
  95
  96 -CFLAGS         = $(INCLUDES) $(MACHINE) $(COMMON_CFLAGS)
  97 +CFLAGS         = $(INCLUDES) $(MACHINE) $(COMMON_CFLAGS) $(SHLIB_CFLAGS)
  98
  99  LINK_LIBS= $(OGDI_LINKLIB) $(GLUTIL_STATICLIB)
 100
 101 --- ogdi-3.1.2/ogdi/tcl_interface/makefile.orig 2001-02-19 04:12:21.000000000 +0000
 102 +++ ogdi-3.1.2/ogdi/tcl_interface/makefile      2004-01-23 16:20:42.000000000 +0000
 103 @@ -17,7 +17,7 @@
 104  SOURCES = ecs_tcl.c
 105
 106  INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(TCL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
 107 -CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS)
 108 +CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS) $(SHLIB_CFLAGS)
 109
 110  LINK_LIBS= $(OGDI_LINKLIB) $(TCL_LINKLIB) $(MATH_LINKLIB)
 111
 112 --- ogdi-3.1.2/contrib/gdal/makefile.orig       2001-05-04 03:13:35.000000000 +0000
 113 +++ ogdi-3.1.2/contrib/gdal/makefile    2004-01-23 16:23:46.000000000 +0000
 114 @@ -11,7 +11,7 @@
 115
 116  INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) \
 117         $(PROJ_INCLUDE)
 118 -CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS)
 119 +CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS) $(SHLIB_CFLAGS)
 120
 121  LINK_LIBS= $(OGDI_LINKLIB) $(GUTIL_LINKLIB)
 122
 123 --- ogdi-3.1.2/ogdi/attr_driver/odbc/makefile.orig      2001-02-19 04:12:21.000000000 +0000
 124 +++ ogdi-3.1.2/ogdi/attr_driver/odbc/makefile   2004-01-23 16:26:58.000000000 +0000
 125 @@ -18,7 +18,7 @@
 126
 127  INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) \
 128            $(OGDI_INCLUDE) $(PROJ_INCLUDE)
 129 -CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS)
 130 +CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS) $(SHLIB_CFLAGS)
 131
 132  LINK_LIBS= $(ODBC_LINKLIB)
 133
 134 --- ogdi-3.1.2/ogdi/driver/network/makefile.orig        2001-02-19 05:12:21.000000000 +0100
 135 +++ ogdi-3.1.2/ogdi/driver/network/makefile     2004-01-23 18:26:57.148973268 +0100
 136 @@ -17,7 +17,7 @@
 137  SOURCES = remote.c ecs_clnt.c
 138
 139  INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(GRASS_INCLUDE) $(PROJ_INCLUDE)
 140 -CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS)
 141 +CFLAGS         = $(INCLUDES) $(COMMON_CFLAGS) $(SHLIB_CFLAGS)
 142
 143  LINK_LIBS= $(OGDI_LINKLIB) $(RPC_LINKLIB) $(WIN_LINKLIB)
 144