mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add libsigc++ as a dependency.

This commit is contained in:
Jonathan Moore Liles 2012-02-25 17:22:42 -08:00
parent a48a739db2
commit cbf5fefa7b
12 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mixer/Makefile
View File

@ -62,7 +62,6 @@ CFLAGS+=-DVERSION=\"$(VERSION)\" \
-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \ -DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
-DPIXMAP_PATH=\"$(PIXMAP_PATH)\" -DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
CXXFLAGS += $(SNDFILE_CFLAGS) $(FLTK_CFLAGS) $(JACK_CFLAGS)
CXXFLAGS := $(CFLAGS) $(CXXFLAGS) CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
INCLUDES := -I. -Iutil -IFL -Inonlib INCLUDES := -I. -Iutil -IFL -Inonlib
@ -90,6 +89,7 @@ include makefile.inc
SRCS:=$(Mixer_SRCS) SRCS:=$(Mixer_SRCS)
OBJS:=$(Mixer_OBJS) OBJS:=$(Mixer_OBJS)
CXXFLAGS += $(Mixer_CFLAGS)
# FIXME: isn't there a better way? # FIXME: isn't there a better way?
$(OBJS): .config Makefile $(OBJS): .config Makefile

1
mixer/configure vendored
View File

@ -21,6 +21,7 @@ require_command makedepend makedepend
require_package JACK 0.103.0 jack require_package JACK 0.103.0 jack
require_package lrdf 0.4.0 lrdf require_package lrdf 0.4.0 lrdf
require_package liblo 0.23 liblo require_package liblo 0.23 liblo
require_package sigcpp 2.0.0 sigc++-2.0
test_version `version_of liblo` 0.26 || warn "Version $(version_of liblo) of liblo is slow to create servers. Consider upgrading to 0.26 or later" test_version `version_of liblo` 0.26 || warn "Version $(version_of liblo) of liblo is slow to create servers. Consider upgrading to 0.26 or later"

4
mixer/makefile.inc
View File

@ -8,7 +8,9 @@ Mixer_SRCS:=$(Mixer_SRCS:.fl=.C)
Mixer_SRCS:=$(sort $(Mixer_SRCS)) Mixer_SRCS:=$(sort $(Mixer_SRCS))
Mixer_OBJS:=$(Mixer_SRCS:.C=.o) Mixer_OBJS:=$(Mixer_SRCS:.C=.o)
Mixer_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(LASH_LIBS) $(LRDF_LIBS) $(LIBLO_LIBS) Mixer_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(LASH_LIBS) $(LRDF_LIBS) $(LIBLO_LIBS) $(SIGCPP_LIBS)
Mixer_CFLAGS := $(FLTK_CFLAGS) $(JACK_CFLAGS) $(LIBLO_CFLAGS) $(SIGCPP_CFLAGS)
src/mixer: $(Mixer_OBJS) FL/libfl_widgets.a nonlib/libnonlib.a src/mixer: $(Mixer_OBJS) FL/libfl_widgets.a nonlib/libnonlib.a
@ echo -n Linking mixer... @ echo -n Linking mixer...

2
nonlib/Makefile
View File

@ -62,7 +62,6 @@ CFLAGS+=-DVERSION=\"$(VERSION)\" \
-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \ -DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
-DPIXMAP_PATH=\"$(PIXMAP_PATH)\" -DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
CXXFLAGS += $(SNDFILE_CFLAGS) $(FLTK_CFLAGS) $(JACK_CFLAGS)
CXXFLAGS := $(CFLAGS) $(CXXFLAGS) CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
INCLUDES := -I. -Iutil -IFL -Inonlib INCLUDES := -I. -Iutil -IFL -Inonlib
@ -88,6 +87,7 @@ include makefile.inc
SRCS:=$(nonlib_SRCS) SRCS:=$(nonlib_SRCS)
OBJS:=$(nonlib_OBJS) OBJS:=$(nonlib_OBJS)
CXXFLAGS += $(nonlib_CFLAGS)
# FIXME: isn't there a better way? # FIXME: isn't there a better way?
$(OBJS): .config Makefile $(OBJS): .config Makefile

4
nonlib/configure vendored
View File

@ -16,5 +16,9 @@ begin_tests
require_command ar ar require_command ar ar
require_command makedepend makedepend require_command makedepend makedepend
require_package JACK 0.103.0 jack require_package JACK 0.103.0 jack
require_package liblo 0.23 liblo
require_package sigcpp 2.0.0 sigc++-2.0
test_version `version_of liblo` 0.26 || warn "Version $(version_of liblo) of liblo is slow to create servers. Consider upgrading to 0.26 or later"
end end

2
nonlib/makefile.inc
View File

@ -5,6 +5,8 @@ nonlib_SRCS := $(wildcard nonlib/*.C nonlib/JACK/*.C nonlib/LASH/*.C nonlib/OSC/
nonlib_SRCS:=$(sort $(nonlib_SRCS)) nonlib_SRCS:=$(sort $(nonlib_SRCS))
nonlib_OBJS:=$(nonlib_SRCS:.C=.o) nonlib_OBJS:=$(nonlib_SRCS:.C=.o)
nonlib_CFLAGS := $(SIGCPP_CFLAGS) $(LIBLO_CFLAGS) $(JACK_CFLAGS)
all: nonlib/libnonlib.a all: nonlib/libnonlib.a
nonlib/libnonlib.a: $(nonlib_OBJS) nonlib/libnonlib.a: $(nonlib_OBJS)

2
session/Makefile
View File

@ -62,7 +62,6 @@ CFLAGS+=-DVERSION=\"$(VERSION)\" \
-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \ -DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
-DPIXMAP_PATH=\"$(PIXMAP_PATH)\" -DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
CXXFLAGS += $(SNDFILE_CFLAGS) $(FLTK_CFLAGS) $(JACK_CFLAGS)
CXXFLAGS := $(CFLAGS) $(CXXFLAGS) CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
INCLUDES := -I. -Iutil -IFL -Inonlib INCLUDES := -I. -Iutil -IFL -Inonlib
@ -90,6 +89,7 @@ include makefile.inc
SRCS:=$(Session_SRCS) SRCS:=$(Session_SRCS)
OBJS:=$(Session_OBJS) OBJS:=$(Session_OBJS)
CXXFLAGS += $(Session_CFLAGS)
# FIXME: isn't there a better way? # FIXME: isn't there a better way?
$(OBJS): .config Makefile $(OBJS): .config Makefile

2
session/configure vendored
View File

@ -19,8 +19,8 @@ require_command FLUID fluid
require_command ar ar require_command ar ar
require_command makedepend makedepend require_command makedepend makedepend
# require_package JACK 0.103.0 jack # require_package JACK 0.103.0 jack
require_package lrdf 0.4.0 lrdf
require_package liblo 0.23 liblo require_package liblo 0.23 liblo
require_package sigcpp 2.0.0 sigc++-2.0
test_version `version_of liblo` 0.26 || warn "Version $(version_of liblo) of liblo is slow to create servers. Consider upgrading to 0.26 or later" test_version `version_of liblo` 0.26 || warn "Version $(version_of liblo) of liblo is slow to create servers. Consider upgrading to 0.26 or later"

5
session/makefile.inc
View File

@ -9,7 +9,8 @@ Session_SRCS:=$(Session_SRCS:.fl=.C)
Session_SRCS:=$(sort $(Session_SRCS)) Session_SRCS:=$(sort $(Session_SRCS))
Session_OBJS:=$(Session_SRCS:.C=.o) Session_OBJS:=$(Session_SRCS:.C=.o)
Session_LIBS := $(LIBLO_LIBS) Session_LIBS := $(LIBLO_LIBS) $(SIGCPP_LIBS)
Session_CFLAGS := $(LIBLO_CFLAGS) $(SIGCPP_CFLAGS)
src/nsmd: src/nsmd.o nonlib/libnonlib.a src/nsmd: src/nsmd.o nonlib/libnonlib.a
@ echo -n Linking session handler. @ echo -n Linking session handler.
@ -17,7 +18,7 @@ src/nsmd: src/nsmd.o nonlib/libnonlib.a
src/session-manager: src/session-manager.o nonlib/libnonlib.a src/session-manager: src/session-manager.o nonlib/libnonlib.a
@ echo -n Linking session handler. @ echo -n Linking session handler.
@ $(CXX) $(CXXFLAGS) $(FLTK_LIBS) $(Session_LIBS) src/session-manager.o -o $@ -Lnonlib -lnonlib -ldl && echo $(DONE) @ $(CXX) $(CXXFLAGS) $(FLTK_CLFAGS) $(FLTK_LIBS) $(Session_LIBS) src/session-manager.o -o $@ -Lnonlib -lnonlib -ldl && echo $(DONE)
src/send_osc: src/send_osc.o nonlib/libnonlib.a src/send_osc: src/send_osc.o nonlib/libnonlib.a
@ $(CXX) $(CXXFLAGS) $(Session_LIBS) src/send_osc.o -o $@ -Lnonlib -lnonlib -ddl && echo $(DONE) @ $(CXX) $(CXXFLAGS) $(Session_LIBS) src/send_osc.o -o $@ -Lnonlib -lnonlib -ddl && echo $(DONE)

2
timeline/Makefile
View File

@ -74,7 +74,6 @@ CFLAGS+=-DVERSION=\"$(VERSION)\" \
-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \ -DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
-DPIXMAP_PATH=\"$(PIXMAP_PATH)\" -DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
CXXFLAGS += $(SNDFILE_CFLAGS) $(FLTK_CFLAGS) $(JACK_CFLAGS)
CXXFLAGS := $(CFLAGS) $(CXXFLAGS) CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
INCLUDES := -I. -Iutil -IFL -Inonlib INCLUDES := -I. -Iutil -IFL -Inonlib
@ -102,6 +101,7 @@ include makefile.inc
SRCS:=$(Timeline_SRCS) SRCS:=$(Timeline_SRCS)
OBJS:=$(Timeline_OBJS) OBJS:=$(Timeline_OBJS)
CXXFLAGS += $(Timeline_CFLAGS)
# FIXME: isn't there a better way? # FIXME: isn't there a better way?
$(OBJS): .config Makefile $(OBJS): .config Makefile

1
timeline/configure vendored
View File

@ -28,6 +28,7 @@ require_command makedepend makedepend
require_package JACK 0.103.0 jack require_package JACK 0.103.0 jack
require_package sndfile 1.0.17 sndfile require_package sndfile 1.0.17 sndfile
require_package liblo 0.23 liblo require_package liblo 0.23 liblo
require_package sigcpp 2.0.0 sigc++-2.0
test_version `version_of liblo` 0.26 || warn "Version $(version_of liblo) of liblo is slow to create servers. Consider upgrading to 0.26 or later" test_version `version_of liblo` 0.26 || warn "Version $(version_of liblo) of liblo is slow to create servers. Consider upgrading to 0.26 or later"

4
timeline/makefile.inc
View File

@ -10,7 +10,9 @@ Timeline_SRCS:=$(Timeline_SRCS:.fl=.C)
Timeline_SRCS:=$(sort $(Timeline_SRCS)) Timeline_SRCS:=$(sort $(Timeline_SRCS))
Timeline_OBJS:=$(Timeline_SRCS:.C=.o) Timeline_OBJS:=$(Timeline_SRCS:.C=.o)
Timeline_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(SNDFILE_LIBS) $(LIBLO_LIBS) Timeline_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(SNDFILE_LIBS) $(LIBLO_LIBS) $(SIGCPP_LIBS)
Timeline_CFLAGS := $(SNDFILE_CFLAGS) $(FLTK_CFLAGS) $(JACK_CFLAGS) $(SIGCPP_CFLAGS)
src/timeline: $(Timeline_OBJS) FL/libfl_widgets.a nonlib/libnonlib.a src/timeline: $(Timeline_OBJS) FL/libfl_widgets.a nonlib/libnonlib.a
@ echo -n Linking timeline... @ echo -n Linking timeline...