diff options
| -rw-r--r-- | configure.ac | 41 | ||||
| -rw-r--r-- | src/libs/client/Makefile.am | 18 | ||||
| -rw-r--r-- | src/libs/engine/Makefile.am | 4 | ||||
| -rw-r--r-- | src/progs/Makefile.am | 4 | ||||
| -rw-r--r-- | src/progs/demolition/DemolitionClientInterface.h | 2 | ||||
| -rw-r--r-- | src/progs/demolition/Makefile.am | 6 | ||||
| -rw-r--r-- | src/progs/gtk/Makefile.am | 7 | ||||
| -rw-r--r-- | src/progs/om/Makefile.am | 2 | ||||
| -rw-r--r-- | src/progs/patch_loader/Makefile.am | 6 |
9 files changed, 47 insertions, 43 deletions
diff --git a/configure.ac b/configure.ac index bcd431f5..e6e2aeba 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,14 @@ AC_PREREQ(2.59) AC_INIT([om],[0.3.0pre],[drobilla@connect.carleton.ca]) -AC_CONFIG_SRCDIR([src/engine/main.cpp]) -AC_CONFIG_SRCDIR([src/engine/tests/node_tree_test.cpp]) -AC_CONFIG_SRCDIR([src/clients/OSCController.cpp]) -AC_CONFIG_SRCDIR([src/clients/patch_loader/patch_loader.cpp]) -AC_CONFIG_SRCDIR([src/clients/demolition/demolition.cpp]) -AC_CONFIG_SRCDIR([src/clients/gtk/main.cpp]) +AC_CONFIG_SRCDIR([src/common/util/CountedPtr.h]) +AC_CONFIG_SRCDIR([src/common/interface/EngineInterface.h]) +AC_CONFIG_SRCDIR([src/libs/engine/JackAudioDriver.cpp]) +AC_CONFIG_SRCDIR([src/libs/engine/tests/node_tree_test.cpp]) +AC_CONFIG_SRCDIR([src/libs/client/OSCController.cpp]) +AC_CONFIG_SRCDIR([src/progs/engine/main.cpp]) +AC_CONFIG_SRCDIR([src/progs/patch_loader/patch_loader.cpp]) +AC_CONFIG_SRCDIR([src/progs/demolition/demolition.cpp]) +AC_CONFIG_SRCDIR([src/progs/gtk/main.cpp]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE @@ -317,23 +320,29 @@ else fi AM_CONDITIONAL(BUILD_GTK_CLIENT, [test "$build_gtk_client" = "yes"]) +# Build client lib if anything above that depends on it is to be built +AM_CONDITIONAL(BUILD_CLIENT_LIB, [test "$build_console_clients" = "yes" -o "$build_gtk_client" = "yes"]) + # Write Makefiles AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([src/Makefile]) -AC_CONFIG_FILES([src/engine/Makefile]) -AC_CONFIG_FILES([src/engine/tests/Makefile]) AC_CONFIG_FILES([src/common/Makefile]) AC_CONFIG_FILES([src/common/util/Makefile]) AC_CONFIG_FILES([src/common/interface/Makefile]) -AC_CONFIG_FILES([src/clients/Makefile]) -AC_CONFIG_FILES([src/clients/supercollider/Makefile]) -AC_CONFIG_FILES([src/clients/python/Makefile]) -AC_CONFIG_FILES([src/clients/python/scripts/Makefile]) -AC_CONFIG_FILES([src/clients/demolition/Makefile]) -AC_CONFIG_FILES([src/clients/patch_loader/Makefile]) -AC_CONFIG_FILES([src/clients/patches/Makefile]) -AC_CONFIG_FILES([src/clients/gtk/Makefile]) +AC_CONFIG_FILES([src/libs/Makefile]) +AC_CONFIG_FILES([src/libs/engine/Makefile]) +AC_CONFIG_FILES([src/libs/engine/tests/Makefile]) +AC_CONFIG_FILES([src/libs/client/Makefile]) +AC_CONFIG_FILES([src/progs/Makefile]) +AC_CONFIG_FILES([src/progs/om/Makefile]) +AC_CONFIG_FILES([src/progs/supercollider/Makefile]) +AC_CONFIG_FILES([src/progs/python/Makefile]) +AC_CONFIG_FILES([src/progs/python/scripts/Makefile]) +AC_CONFIG_FILES([src/progs/demolition/Makefile]) +AC_CONFIG_FILES([src/progs/patch_loader/Makefile]) +AC_CONFIG_FILES([src/progs/gtk/Makefile]) +AC_CONFIG_FILES([patches/Makefile]) AC_OUTPUT # Display summary diff --git a/src/libs/client/Makefile.am b/src/libs/client/Makefile.am index 24e6a3bb..ada22522 100644 --- a/src/libs/client/Makefile.am +++ b/src/libs/client/Makefile.am @@ -1,13 +1,11 @@ AM_CXXFLAGS = -I$(top_srcdir)/src/common -fno-exceptions -fno-rtti -SUBDIRS = . python supercollider +if BUILD_CLIENT_LIB +noinst_LTLIBRARIES = libomclient.la -if BUILD_CONSOLE_CLIENTS -noinst_LIBRARIES = libomclient.a +libomclient_la_CXXFLAGS = -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" $(LIBGLADEMM_CFLAGS) $(GNOMECANVASMM_CFLAGS) $(JACK_CFLAGS) $(LXML2_CFLAGS) -libomclient_a_CXXFLAGS = -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" $(LIBGLADEMM_CFLAGS) $(GNOMECANVASMM_CFLAGS) $(JACK_CFLAGS) $(LXML2_CFLAGS) - -libomclient_a_SOURCES = \ +libomclient_la_SOURCES = \ ClientInterface.h \ OSCEngineInterface.h \ OSCEngineInterface.cpp \ @@ -41,11 +39,5 @@ libomclient_a_SOURCES = \ $(top_srcdir)/src/common/interface/ClientInterface.h \ $(top_srcdir)/src/common/interface/EngineInterface.h -SUBDIRS += patch_loader patches demolition - -endif # BUILD_CONSOLE_CLIENTS - -if BUILD_GTK_CLIENT -SUBDIRS += gtk -endif +endif # BUILD_CLIENT_LIB diff --git a/src/libs/engine/Makefile.am b/src/libs/engine/Makefile.am index 3b425ba2..6f0c023d 100644 --- a/src/libs/engine/Makefile.am +++ b/src/libs/engine/Makefile.am @@ -1,11 +1,11 @@ SUBDIRS = tests DIST_SUBDIRS = events -AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/libom_la -I$(top_srcdir)/src/engine/events -fno-exceptions -fno-rtti +AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine/events -fno-exceptions -fno-rtti MAINTAINERCLEANFILES = Makefile.in -LTLIBRARIES = libom.la +noinst_LTLIBRARIES = libom.la libom_la_SOURCES = \ util.h \ diff --git a/src/progs/Makefile.am b/src/progs/Makefile.am index ad10dcf6..520c3652 100644 --- a/src/progs/Makefile.am +++ b/src/progs/Makefile.am @@ -1,6 +1,8 @@ AM_CXXFLAGS = -I$(top_srcdir)/src/common -fno-exceptions -fno-rtti -SUBDIRS = . python supercollider +DIST_SUBDIRS = python supercollider + +SUBDIRS = om if BUILD_CONSOLE_CLIENTS SUBDIRS += patch_loader demolition diff --git a/src/progs/demolition/DemolitionClientInterface.h b/src/progs/demolition/DemolitionClientInterface.h index 374008b5..7b114c52 100644 --- a/src/progs/demolition/DemolitionClientInterface.h +++ b/src/progs/demolition/DemolitionClientInterface.h @@ -43,7 +43,7 @@ public: void bundle_begin() {} void bundle_end() {} - void num_plugins(size_t num) {} + void num_plugins(uint32_t num) {} // OSC thread functions void error(const string& msg); diff --git a/src/progs/demolition/Makefile.am b/src/progs/demolition/Makefile.am index 4854f045..64fb3315 100644 --- a/src/progs/demolition/Makefile.am +++ b/src/progs/demolition/Makefile.am @@ -1,11 +1,11 @@ EXTRA_DIST = README -om_demolition_CXXFLAGS = -I$(top_srcdir)/src/clients -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" $(LXML2_CFLAGS) $(LOSC_CFLAGS) -om_demolition_LDADD = ../libomclient.a $(LOSC_LIBS) $(LXML2_LIBS) +om_demolition_CXXFLAGS = -I$(top_srcdir)/src/libs/client -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" $(LXML2_CFLAGS) $(LOSC_CFLAGS) +om_demolition_LDADD = ../../libs/client/libomclient.la $(LOSC_LIBS) $(LXML2_LIBS) bin_PROGRAMS = om_demolition -om_demolition_DEPENDENCIES = ../libomclient.a +om_demolition_DEPENDENCIES = ../../libs/client/libomclient.la om_demolition_SOURCES = \ DemolitionClientInterface.h \ diff --git a/src/progs/gtk/Makefile.am b/src/progs/gtk/Makefile.am index c92ae2b2..42d66b05 100644 --- a/src/progs/gtk/Makefile.am +++ b/src/progs/gtk/Makefile.am @@ -1,13 +1,14 @@ if BUILD_GTK_CLIENT EXTRA_DIST = om_gtk.gladep +MAINTAINERCLEANFILES = Makefile.in sharefilesdir = $(pkgdatadir) dist_sharefiles_DATA = om_gtk.glade om-icon.png -AM_CXXFLAGS = -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -I$(top_srcdir)/src/common -I$(top_srcdir)/src/clients -DPKGDATADIR=\"$(pkgdatadir)\" @GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @LOSC_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@ -om_gtk_LDADD = @GTKMM_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @LOSC_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ ../libomclient.a -om_gtk_DEPENDENCIES = ../libomclient.a +AM_CXXFLAGS = -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/client -DPKGDATADIR=\"$(pkgdatadir)\" @GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @LOSC_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@ +om_gtk_LDADD = @GTKMM_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @LOSC_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ ../../libs/client/libomclient.la +om_gtk_DEPENDENCIES = ../../libs/client/libomclient.la bin_PROGRAMS = om_gtk diff --git a/src/progs/om/Makefile.am b/src/progs/om/Makefile.am index 2f503130..2689088e 100644 --- a/src/progs/om/Makefile.am +++ b/src/progs/om/Makefile.am @@ -1,4 +1,4 @@ -AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/engine -I$(top_srcdir)/src/engine/events -fno-exceptions -fno-rtti +AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine -I$(top_srcdir)/src/libs/engine/events -fno-exceptions -fno-rtti MAINTAINERCLEANFILES = Makefile.in diff --git a/src/progs/patch_loader/Makefile.am b/src/progs/patch_loader/Makefile.am index 15e0c503..1dddefbb 100644 --- a/src/progs/patch_loader/Makefile.am +++ b/src/progs/patch_loader/Makefile.am @@ -1,11 +1,11 @@ EXTRA_DIST = README -om_patch_loader_CXXFLAGS = -I$(top_srcdir)/src/clients -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" $(LXML2_CFLAGS) $(LOSC_CFLAGS) -om_patch_loader_LDADD = ../libomclient.a $(LOSC_LIBS) $(LXML2_LIBS) +om_patch_loader_CXXFLAGS = -I$(top_srcdir)/src/libs/client -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" $(LXML2_CFLAGS) $(LOSC_CFLAGS) +om_patch_loader_LDADD = ../../libs/client/libomclient.la $(LOSC_LIBS) $(LXML2_LIBS) bin_PROGRAMS = om_patch_loader -om_patch_loader_DEPENDENCIES = ../libomclient.a +om_patch_loader_DEPENDENCIES = ../../libs/client/libomclient.la om_patch_loader_SOURCES = \ patch_loader.cpp \ |