Attachment #694596 for bug #778314

View | Details | Raw Unified | Return to bug 778314
Collapse All | Expand All




noinst_LTLIBRARIES =

noinst_PROGRAMS = calfbenchmark
pkglib_LTLIBRARIES = libcalf.la

AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)
# TODO: Remove -finline flags is clang is used

noinst_LTLIBRARIES += libcalfgui.la
bin_PROGRAMS += calfjackhost 
calfjackhost_SOURCES = gtk_session_env.cpp host_session.cpp jack_client.cpp jackhost.cpp gtk_main_win.cpp connector.cpp session_mgr.cpp
calfjackhost_LDADD = libcalfgui.la libcalf.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS) $(FLUIDSYNTH_DEPS_LIBS)
if USE_LASH
AM_CXXFLAGS += $(LASH_DEPS_CFLAGS)
calfjackhost_LDADD += $(LASH_DEPS_LIBS)

AM_CXXFLAGS += $(GLIB_DEPS_CFLAGS)
noinst_PROGRAMS += calfmakerdf
calfmakerdf_SOURCES = makerdf.cpp
calfmakerdf_LDADD = libcalf.la

calfbenchmark_SOURCES = benchmark.cpp
calfbenchmark_LDADD = libcalf.la

libcalf_la_SOURCES = audio_fx.cpp analyzer.cpp lv2wrap.cpp metadata.cpp modules_tools.cpp modules_delay.cpp modules_comp.cpp modules_limit.cpp modules_dist.cpp modules_filter.cpp modules_mod.cpp modules_pitch.cpp fluidsynth.cpp giface.cpp monosynth.cpp organ.cpp osctl.cpp plugin.cpp preset.cpp synth.cpp utils.cpp wavetable.cpp modmatrix.cpp
libcalf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS)
if USE_DEBUG
libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
else
libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"
endif

if USE_LV2_GUI

# Version WITH out-of-process GUI - links GTK+, UI controls etc.

noinst_LTLIBRARIES += libcalflv2gui.la

libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp

if USE_DEBUG
libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
else
libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
endif

endif
--
src/Makefile.am | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)





# Version WITH out-of-process GUI - links GTK+, UI controls etc.

if USE_LV2_GUI
pkglib_LTLIBRARIES += libcalflv2gui.la

libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp


else
libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
endif
endif

endif


if USE_LV2
	install -d -m 755 $(DESTDIR)$(lv2dir)
	ln -sf $(pkglibdir)/calf.so $(DESTDIR)$(lv2dir)/calf.so
if USE_LV2_GUI
	install -c -m 755 $(top_builddir)/src/.libs/calflv2gui.so $(DESTDIR)$(lv2dir)/calflv2gui.so
endif
	rm -f $(DESTDIR)$(lv2dir)/*.ttl
	$(top_builddir)/src/calfmakerdf -m ttl -p $(DESTDIR)$(lv2dir)/ -d $(DESTDIR)$(pkgdatadir)/
if USE_SORDI

Return to bug 778314

Lines 8-14 bin_PROGRAMS = Link Here

(-)a/src/Makefile.am (-13 / +12 lines)
8	noinst_LTLIBRARIES =	8	noinst_LTLIBRARIES =
9		9
10	noinst_PROGRAMS = calfbenchmark	10	noinst_PROGRAMS = calfbenchmark
11	pkglib_LTLIBRARIES = calf.la	11	pkglib_LTLIBRARIES = libcalf.la
12		12
13	AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)	13	AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)
14	# TODO: Remove -finline flags is clang is used	14	# TODO: Remove -finline flags is clang is used
Lines 22-28 AM_CXXFLAGS += $(JACK_DEPS_CFLAGS) Link Here
22	noinst_LTLIBRARIES += libcalfgui.la	22	noinst_LTLIBRARIES += libcalfgui.la
23	bin_PROGRAMS += calfjackhost	23	bin_PROGRAMS += calfjackhost
24	calfjackhost_SOURCES = gtk_session_env.cpp host_session.cpp jack_client.cpp jackhost.cpp gtk_main_win.cpp connector.cpp session_mgr.cpp	24	calfjackhost_SOURCES = gtk_session_env.cpp host_session.cpp jack_client.cpp jackhost.cpp gtk_main_win.cpp connector.cpp session_mgr.cpp
25	calfjackhost_LDADD = libcalfgui.la calf.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS) $(FLUIDSYNTH_DEPS_LIBS)	25	calfjackhost_LDADD = libcalfgui.la libcalf.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS) $(FLUIDSYNTH_DEPS_LIBS)
26	if USE_LASH	26	if USE_LASH
27	AM_CXXFLAGS += $(LASH_DEPS_CFLAGS)	27	AM_CXXFLAGS += $(LASH_DEPS_CFLAGS)
28	calfjackhost_LDADD += $(LASH_DEPS_LIBS)	28	calfjackhost_LDADD += $(LASH_DEPS_LIBS)
Lines 32-62 endif Link Here
32	AM_CXXFLAGS += $(GLIB_DEPS_CFLAGS)	32	AM_CXXFLAGS += $(GLIB_DEPS_CFLAGS)
33	noinst_PROGRAMS += calfmakerdf	33	noinst_PROGRAMS += calfmakerdf
34	calfmakerdf_SOURCES = makerdf.cpp	34	calfmakerdf_SOURCES = makerdf.cpp
35	calfmakerdf_LDADD = calf.la	35	calfmakerdf_LDADD = libcalf.la
36		36
37	calfbenchmark_SOURCES = benchmark.cpp	37	calfbenchmark_SOURCES = benchmark.cpp
38	calfbenchmark_LDADD = calf.la	38	calfbenchmark_LDADD = libcalf.la
39		39
40	calf_la_SOURCES = audio_fx.cpp analyzer.cpp lv2wrap.cpp metadata.cpp modules_tools.cpp modules_delay.cpp modules_comp.cpp modules_limit.cpp modules_dist.cpp modules_filter.cpp modules_mod.cpp modules_pitch.cpp fluidsynth.cpp giface.cpp monosynth.cpp organ.cpp osctl.cpp plugin.cpp preset.cpp synth.cpp utils.cpp wavetable.cpp modmatrix.cpp	40	libcalf_la_SOURCES = audio_fx.cpp analyzer.cpp lv2wrap.cpp metadata.cpp modules_tools.cpp modules_delay.cpp modules_comp.cpp modules_limit.cpp modules_dist.cpp modules_filter.cpp modules_mod.cpp modules_pitch.cpp fluidsynth.cpp giface.cpp monosynth.cpp organ.cpp osctl.cpp plugin.cpp preset.cpp synth.cpp utils.cpp wavetable.cpp modmatrix.cpp
41	calf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS)	41	libcalf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS)
42	if USE_DEBUG	42	if USE_DEBUG
43	calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static	43	libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
44	else	44	else
45	calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"	45	libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"
46	endif	46	endif
47		47
48	if USE_LV2_GUI	48	if USE_LV2_GUI
49		49
50	# Version WITH out-of-process GUI - links GTK+, UI controls etc.	50	# Version WITH out-of-process GUI - links GTK+, UI controls etc.
51		51
52	noinst_LTLIBRARIES += calflv2gui.la	52	noinst_LTLIBRARIES += libcalflv2gui.la
53		53
54	calflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp	54	libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp
55		55
56	if USE_DEBUG	56	if USE_DEBUG
57	calflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete	57	libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete
58	else	58	else
59	calflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete	59	libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete
60	endif	60	endif
61		61
62	endif	62	endif
63	--
64	src/Makefile.am \| 7 +++----	63	src/Makefile.am \| 7 +++----
65	1 file changed, 3 insertions(+), 4 deletions(-)	64	1 file changed, 3 insertions(+), 4 deletions(-)

Lines 49-55 if USE_LV2_GUI Link Here

(-)a/src/Makefile.am (-4 / +3 lines)
49		49
50	# Version WITH out-of-process GUI - links GTK+, UI controls etc.	50	# Version WITH out-of-process GUI - links GTK+, UI controls etc.
51		51
52	noinst_LTLIBRARIES += libcalflv2gui.la	52	if USE_LV2_GUI
		53	pkglib_LTLIBRARIES += libcalflv2gui.la
53		54
54	libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp	55	libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp
55		56
Lines 58-63 libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI Link Here
58	else	59	else
59	libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete	60	libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static -Wl,-z,nodelete
60	endif	61	endif
		62	endif
61		63
62	endif	64	endif
63		65
Lines 78-86 endif Link Here
78	if USE_LV2	80	if USE_LV2
79	install -d -m 755 $(DESTDIR)$(lv2dir)	81	install -d -m 755 $(DESTDIR)$(lv2dir)
80	ln -sf $(pkglibdir)/calf.so $(DESTDIR)$(lv2dir)/calf.so	82	ln -sf $(pkglibdir)/calf.so $(DESTDIR)$(lv2dir)/calf.so
81	if USE_LV2_GUI
82	install -c -m 755 $(top_builddir)/src/.libs/calflv2gui.so $(DESTDIR)$(lv2dir)/calflv2gui.so
83	endif
84	rm -f $(DESTDIR)$(lv2dir)/*.ttl	83	rm -f $(DESTDIR)$(lv2dir)/*.ttl
85	$(top_builddir)/src/calfmakerdf -m ttl -p $(DESTDIR)$(lv2dir)/ -d $(DESTDIR)$(pkgdatadir)/	84	$(top_builddir)/src/calfmakerdf -m ttl -p $(DESTDIR)$(lv2dir)/ -d $(DESTDIR)$(pkgdatadir)/
86	if USE_SORDI	85	if USE_SORDI