diff --git a/plugins/input/gdal/SConscript b/plugins/input/gdal/SConscript index 06af74f13..ce6f11abe 100644 --- a/plugins/input/gdal/SConscript +++ b/plugins/input/gdal/SConscript @@ -34,12 +34,17 @@ gdal_src = Split( ) libraries = [env['PLUGINS']['gdal']['lib']] + if env['PLATFORM'] == 'Darwin': libraries.append('mapnik2') libraries.append(env['ICU_LIB_NAME']) -gdal_inputdriver = plugin_env.SharedLibrary('../gdal', source=gdal_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) +input_plugin = plugin_env.SharedLibrary('../gdal', source=gdal_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) + +if env['PLATFORM'] == 'Darwin': + # if the plugin links to libmapnik2 ensure it is built first + Depends(input_plugin,'../../../src/libmapnik2.dylib') if 'uninstall' not in COMMAND_LINE_TARGETS: - env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', gdal_inputdriver) + env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', input_plugin) env.Alias('install', install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input') diff --git a/plugins/input/geos/SConscript b/plugins/input/geos/SConscript index 19218e72b..513373646 100644 --- a/plugins/input/geos/SConscript +++ b/plugins/input/geos/SConscript @@ -41,7 +41,11 @@ if env['PLATFORM'] == 'Darwin': libraries.append('boost_system%s' % env['BOOST_APPEND']) libraries.append('boost_filesystem%s' % env['BOOST_APPEND']) -geos_inputdriver = env.SharedLibrary('../geos', source=geos_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) +input_plugin = env.SharedLibrary('../geos', source=geos_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) -env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', geos_inputdriver) +if env['PLATFORM'] == 'Darwin': + # if the plugin links to libmapnik2 ensure it is built first + Depends(input_plugin,'../../../src/libmapnik2.dylib') + +env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', input_plugin) 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 f4ccef011..c24afc42a 100644 --- a/plugins/input/kismet/SConscript +++ b/plugins/input/kismet/SConscript @@ -39,8 +39,12 @@ if env['PLATFORM'] == 'Darwin': libraries.append(env['ICU_LIB_NAME']) libraries.append('boost_thread%s' % env['BOOST_APPEND']) -kismet_inputdriver = plugin_env.SharedLibrary('../kismet', source=kismet_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) +input_plugin = plugin_env.SharedLibrary('../kismet', source=kismet_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) + +if env['PLATFORM'] == 'Darwin': + # if the plugin links to libmapnik2 ensure it is built first + Depends(input_plugin,'../../../src/libmapnik2.dylib') if 'uninstall' not in COMMAND_LINE_TARGETS: - env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', kismet_inputdriver) + env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', input_plugin) 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 47f29712c..bc064aa3c 100644 --- a/plugins/input/occi/SConscript +++ b/plugins/input/occi/SConscript @@ -41,8 +41,12 @@ if env['PLATFORM'] == 'Darwin': libraries.append('mapnik2') libraries.append(env['ICU_LIB_NAME']) -occi_inputdriver = plugin_env.SharedLibrary('../occi', source=occi_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) +input_plugin = plugin_env.SharedLibrary('../occi', source=occi_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) + +if env['PLATFORM'] == 'Darwin': + # if the plugin links to libmapnik2 ensure it is built first + Depends(input_plugin,'../../../src/libmapnik2.dylib') if 'uninstall' not in COMMAND_LINE_TARGETS: - env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', occi_inputdriver) + env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', input_plugin) 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 f00badf48..ebbfede73 100644 --- a/plugins/input/ogr/SConscript +++ b/plugins/input/ogr/SConscript @@ -45,8 +45,12 @@ if env['PLATFORM'] == 'Darwin': libraries.append('boost_system%s' % env['BOOST_APPEND']) libraries.append('boost_filesystem%s' % env['BOOST_APPEND']) -ogr_inputdriver = plugin_env.SharedLibrary('../ogr', source=ogr_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) +input_plugin = plugin_env.SharedLibrary('../ogr', source=ogr_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) + +if env['PLATFORM'] == 'Darwin': + # if the plugin links to libmapnik2 ensure it is built first + Depends(input_plugin,'../../../src/libmapnik2.dylib') if 'uninstall' not in COMMAND_LINE_TARGETS: - env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', ogr_inputdriver) + env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', input_plugin) 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 c992174bd..5b88cd8bb 100644 --- a/plugins/input/osm/SConscript +++ b/plugins/input/osm/SConscript @@ -43,8 +43,12 @@ if env['PLATFORM'] == 'Darwin': libraries.append('mapnik2') libraries.append(env['ICU_LIB_NAME']) -osm_inputdriver = plugin_env.SharedLibrary('../osm', source=osm_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) +input_plugin = plugin_env.SharedLibrary('../osm', source=osm_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) + +if env['PLATFORM'] == 'Darwin': + # if the plugin links to libmapnik2 ensure it is built first + Depends(input_plugin,'../../../src/libmapnik2.dylib') if 'uninstall' not in COMMAND_LINE_TARGETS: - env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', osm_inputdriver) + env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', input_plugin) 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 44f163e7c..828a77cb2 100644 --- a/plugins/input/postgis/SConscript +++ b/plugins/input/postgis/SConscript @@ -41,8 +41,12 @@ if env['PLATFORM'] == 'Darwin': if env['THREADING'] == 'multi': libraries.append('boost_thread%s' % env['BOOST_APPEND']) -postgis_inputdriver = plugin_env.SharedLibrary('../postgis', source=postgis_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) +input_plugin = plugin_env.SharedLibrary('../postgis', source=postgis_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) + +if env['PLATFORM'] == 'Darwin': + # if the plugin links to libmapnik2 ensure it is built first + Depends(input_plugin,'../../../src/libmapnik2.dylib') if 'uninstall' not in COMMAND_LINE_TARGETS: - env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', postgis_inputdriver) + env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', input_plugin) 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 37247f4c7..f0c49d53b 100644 --- a/plugins/input/raster/SConscript +++ b/plugins/input/raster/SConscript @@ -41,8 +41,12 @@ if env['PLATFORM'] == 'Darwin': libraries.append('boost_system%s' % env['BOOST_APPEND']) libraries.append('boost_filesystem%s' % env['BOOST_APPEND']) -raster_inputdriver = plugin_env.SharedLibrary('../raster', source=raster_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) +input_plugin = plugin_env.SharedLibrary('../raster', source=raster_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) + +if env['PLATFORM'] == 'Darwin': + # if the plugin links to libmapnik2 ensure it is built first + Depends(input_plugin,'../../../src/libmapnik2.dylib') if 'uninstall' not in COMMAND_LINE_TARGETS: - env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', raster_inputdriver) + env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', input_plugin) 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 375bd4fdb..4424869f5 100644 --- a/plugins/input/rasterlite/SConscript +++ b/plugins/input/rasterlite/SConscript @@ -41,8 +41,12 @@ if env['PLATFORM'] == 'Darwin': libraries.append('boost_system%s' % env['BOOST_APPEND']) libraries.append('boost_filesystem%s' % env['BOOST_APPEND']) -rasterlite_inputdriver = plugin_env.SharedLibrary('../rasterlite', source=rasterlite_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) +input_plugin = plugin_env.SharedLibrary('../rasterlite', source=rasterlite_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) + +if env['PLATFORM'] == 'Darwin': + # if the plugin links to libmapnik2 ensure it is built first + Depends(input_plugin,'../../../src/libmapnik2.dylib') if 'uninstall' not in COMMAND_LINE_TARGETS: - env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', rasterlite_inputdriver) + env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', input_plugin) 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 fce4f3fe0..1e728cda2 100644 --- a/plugins/input/shape/SConscript +++ b/plugins/input/shape/SConscript @@ -49,8 +49,12 @@ if env['PLATFORM'] == 'Darwin': if env['SHAPE_MEMORY_MAPPED_FILE']: plugin_env.Append(CXXFLAGS = '-DSHAPE_MEMORY_MAPPED_FILE') -shape_inputdriver = plugin_env.SharedLibrary('../shape', SHLIBSUFFIX='.input', source=shape_src, SHLIBPREFIX='', LIBS = libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) +input_plugin = plugin_env.SharedLibrary('../shape', SHLIBSUFFIX='.input', source=shape_src, SHLIBPREFIX='', LIBS = libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) + +if env['PLATFORM'] == 'Darwin': + # if the plugin links to libmapnik2 ensure it is built first + Depends(input_plugin,'../../../src/libmapnik2.dylib') if 'uninstall' not in COMMAND_LINE_TARGETS: - env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', shape_inputdriver) + env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', input_plugin) 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 8fb55ad5c..85a37e848 100644 --- a/plugins/input/sqlite/SConscript +++ b/plugins/input/sqlite/SConscript @@ -40,8 +40,12 @@ if env['PLATFORM'] == 'Darwin': libraries.append('boost_system%s' % env['BOOST_APPEND']) libraries.append('boost_filesystem%s' % env['BOOST_APPEND']) -sqlite_inputdriver = plugin_env.SharedLibrary('../sqlite', source=sqlite_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) +input_plugin = plugin_env.SharedLibrary('../sqlite', source=sqlite_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) + +if env['PLATFORM'] == 'Darwin': + # if the plugin links to libmapnik2 ensure it is built first + Depends(input_plugin,'../../../src/libmapnik2.dylib') if 'uninstall' not in COMMAND_LINE_TARGETS: - env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', sqlite_inputdriver) + env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input', input_plugin) env.Alias('install', install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/input')