From 2a9d2e8192820d9d6060daccd047d4e8df4ffa7b Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 13 Jul 2010 23:26:05 +0000 Subject: [PATCH] place built plugin targets in input/ directory to make local registration easier --- plugins/input/gdal/SConscript | 2 +- plugins/input/kismet/SConscript | 2 +- plugins/input/occi/SConscript | 2 +- plugins/input/ogr/SConscript | 2 +- plugins/input/osm/SConscript | 2 +- plugins/input/postgis/SConscript | 2 +- plugins/input/raster/SConscript | 2 +- plugins/input/rasterlite/SConscript | 2 +- plugins/input/shape/SConscript | 2 +- plugins/input/sqlite/SConscript | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/input/gdal/SConscript b/plugins/input/gdal/SConscript index 5329b261d..5438afb8c 100644 --- a/plugins/input/gdal/SConscript +++ b/plugins/input/gdal/SConscript @@ -36,7 +36,7 @@ if env['PLATFORM'] == 'Darwin': libraries.append('mapnik2') libraries.append(env['ICU_LIB_NAME']) -gdal_inputdriver = env.SharedLibrary('gdal', source=gdal_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) +gdal_inputdriver = env.SharedLibrary('../gdal', source=gdal_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', gdal_inputdriver) env.Alias('install', install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input') diff --git a/plugins/input/kismet/SConscript b/plugins/input/kismet/SConscript index 329deea6a..d4c210724 100644 --- a/plugins/input/kismet/SConscript +++ b/plugins/input/kismet/SConscript @@ -37,7 +37,7 @@ if env['PLATFORM'] == 'Darwin': libraries.append(env['ICU_LIB_NAME']) libraries.append('boost_thread%s' % env['BOOST_APPEND']) -kismet_inputdriver = env.SharedLibrary('kismet', source=kismet_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) +kismet_inputdriver = env.SharedLibrary('../kismet', source=kismet_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', kismet_inputdriver) env.Alias('install', install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input') diff --git a/plugins/input/occi/SConscript b/plugins/input/occi/SConscript index 77ef152bf..33b737f80 100644 --- a/plugins/input/occi/SConscript +++ b/plugins/input/occi/SConscript @@ -39,7 +39,7 @@ if env['PLATFORM'] == 'Darwin': libraries.append('mapnik2') libraries.append(env['ICU_LIB_NAME']) -occi_inputdriver = env.SharedLibrary('occi', source=occi_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) +occi_inputdriver = env.SharedLibrary('../occi', source=occi_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', occi_inputdriver) env.Alias('install', install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input') diff --git a/plugins/input/ogr/SConscript b/plugins/input/ogr/SConscript index c9ffb2ebe..b4a9a8622 100644 --- a/plugins/input/ogr/SConscript +++ b/plugins/input/ogr/SConscript @@ -43,7 +43,7 @@ if env['PLATFORM'] == 'Darwin': libraries.append('boost_system%s' % env['BOOST_APPEND']) libraries.append('boost_filesystem%s' % env['BOOST_APPEND']) -ogr_inputdriver = env.SharedLibrary('ogr', source=ogr_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) +ogr_inputdriver = env.SharedLibrary('../ogr', source=ogr_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', ogr_inputdriver) env.Alias('install', install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input') diff --git a/plugins/input/osm/SConscript b/plugins/input/osm/SConscript index f6bba1be9..4652d4db1 100644 --- a/plugins/input/osm/SConscript +++ b/plugins/input/osm/SConscript @@ -41,7 +41,7 @@ if env['PLATFORM'] == 'Darwin': libraries.append('mapnik2') libraries.append(env['ICU_LIB_NAME']) -osm_inputdriver = env.SharedLibrary('osm', source=osm_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) +osm_inputdriver = env.SharedLibrary('../osm', source=osm_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', osm_inputdriver) env.Alias('install', install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input') diff --git a/plugins/input/postgis/SConscript b/plugins/input/postgis/SConscript index 46f8331a8..062e7ac4e 100644 --- a/plugins/input/postgis/SConscript +++ b/plugins/input/postgis/SConscript @@ -39,7 +39,7 @@ if env['PLATFORM'] == 'Darwin': if env['THREADING'] == 'multi': libraries.append('boost_thread%s' % env['BOOST_APPEND']) -postgis_inputdriver = env.SharedLibrary('postgis', source=postgis_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) +postgis_inputdriver = env.SharedLibrary('../postgis', source=postgis_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', postgis_inputdriver) env.Alias('install', install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input') diff --git a/plugins/input/raster/SConscript b/plugins/input/raster/SConscript index 4bf8601e1..cfceeb464 100644 --- a/plugins/input/raster/SConscript +++ b/plugins/input/raster/SConscript @@ -39,7 +39,7 @@ if env['PLATFORM'] == 'Darwin': libraries.append('boost_system%s' % env['BOOST_APPEND']) libraries.append('boost_filesystem%s' % env['BOOST_APPEND']) -raster_inputdriver = env.SharedLibrary('raster', source=raster_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) +raster_inputdriver = env.SharedLibrary('../raster', source=raster_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', raster_inputdriver) env.Alias('install', install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input') diff --git a/plugins/input/rasterlite/SConscript b/plugins/input/rasterlite/SConscript index 1968e9b79..6041a1fa7 100644 --- a/plugins/input/rasterlite/SConscript +++ b/plugins/input/rasterlite/SConscript @@ -36,7 +36,7 @@ if env['PLATFORM'] == 'Darwin': libraries.append('mapnik2') libraries.append(env['ICU_LIB_NAME']) -rasterlite_inputdriver = env.SharedLibrary('rasterlite', source=rasterlite_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) +rasterlite_inputdriver = env.SharedLibrary('../rasterlite', source=rasterlite_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', rasterlite_inputdriver) env.Alias('install', install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input') diff --git a/plugins/input/shape/SConscript b/plugins/input/shape/SConscript index d1fcb72b8..aee9460db 100644 --- a/plugins/input/shape/SConscript +++ b/plugins/input/shape/SConscript @@ -48,7 +48,7 @@ cxx_flags = env['CXXFLAGS'] if env['SHAPE_MEMORY_MAPPED_FILE']: cxx_flags.append('-DSHAPE_MEMORY_MAPPED_FILE') -shape_inputdriver = env.SharedLibrary('shape', SHLIBSUFFIX='.input', source=shape_src, SHLIBPREFIX='', LIBS = libraries, CXXFLAGS=cxx_flags) +shape_inputdriver = env.SharedLibrary('../shape', SHLIBSUFFIX='.input', source=shape_src, SHLIBPREFIX='', LIBS = libraries, CXXFLAGS=cxx_flags) env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', shape_inputdriver) env.Alias('install', install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input') diff --git a/plugins/input/sqlite/SConscript b/plugins/input/sqlite/SConscript index 7ff9a9600..942de854f 100644 --- a/plugins/input/sqlite/SConscript +++ b/plugins/input/sqlite/SConscript @@ -38,7 +38,7 @@ if env['PLATFORM'] == 'Darwin': libraries.append('boost_system%s' % env['BOOST_APPEND']) libraries.append('boost_filesystem%s' % env['BOOST_APPEND']) -sqlite_inputdriver = env.SharedLibrary('sqlite', source=sqlite_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) +sqlite_inputdriver = env.SharedLibrary('../sqlite', source=sqlite_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', sqlite_inputdriver) env.Alias('install', install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input')