1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
Description: Use Debian packages siscone since code copy of siscone was removed from source package
Bug-Debian: https://bugs.debian.org/999761
Author: Andreas Tille <tille@debian.org>
Last-Update: Wed, 09 Mar 2022 09:35:36 +0100
--- a/plugins/SISCone/Makefile.am
+++ b/plugins/SISCone/Makefile.am
@@ -1,12 +1,12 @@
-SUBDIRS = siscone fastjet .
+SUBDIRS = fastjet .
if MONOLITHIC_PLUGINS
noinst_LTLIBRARIES = libSISConePlugin.la
else
lib_LTLIBRARIES = libSISConePlugin.la
endif
-libSISConePlugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir) -I$(srcdir)/siscone -I$(srcdir)/../../include -I./siscone
+libSISConePlugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir) -I/usr/include/siscone -I$(srcdir)/../../include
libSISConePlugin_la_SOURCES = SISConeBasePlugin.cc SISConePlugin.cc SISConeSphericalPlugin.cc
-libSISConePlugin_la_LIBADD = ../../src/libfastjet.la siscone/siscone/libsiscone.la siscone/siscone/spherical/libsiscone_spherical.la
+libSISConePlugin_la_LIBADD = ../../src/libfastjet.la -lsiscone -lsiscone_spherical
EXTRA_DIST = makefile.static
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -42,8 +42,8 @@ noinst_PROGRAMS += 03-plugin
#03_plugin_SHORTNAME = 03
03_plugin_CXXFLAGS = $(AM_CXXFLAGS) $(CGAL_CPPFLAGS) -I$(srcdir)/../include
03_plugin_LDADD = ../src/libfastjet.la $(CGAL_LIBS)
-03_plugin_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
-03_plugin_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
+03_plugin_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I/usr/include/siscone
+03_plugin_LDADD += ../plugins/SISCone/libSISConePlugin.la
else
EXTRA_DIST += 03-plugin.cc
endif
@@ -124,8 +124,8 @@ fastjet_areas_SOURCES = fastjet_areas.cc
fastjet_areas_CXXFLAGS = $(AM_CXXFLAGS) $(CGAL_CPPFLAGS) -I$(srcdir)/../include
fastjet_areas_LDADD = ../src/libfastjet.la $(CGAL_LIBS)
if BUILD_PLUGIN_SISCONE
-fastjet_areas_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
-fastjet_areas_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
+fastjet_areas_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I/usr/include/siscone
+fastjet_areas_LDADD += ../plugins/SISCone/libSISConePlugin.la -lsiscone -lsiscone_spherical
endif
fastjet_timing_plugins_SOURCES = fastjet_timing_plugins.cc CmdLine.cc
@@ -134,8 +134,8 @@ fastjet_timing_plugins_LDADD = ../src/li
fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../tools
fastjet_timing_plugins_LDADD += ../tools/libfastjettools.la
if BUILD_PLUGIN_SISCONE
-fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
-fastjet_timing_plugins_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
+fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I/usr/include/siscone
+fastjet_timing_plugins_LDADD += ../plugins/SISCone/libSISConePlugin.la
endif
if BUILD_PLUGIN_CDFCONES
fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/CDFCones
|
