From 84a2bdcb17ac8f189ecb4b50f8c42ff63263fc40 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Thu, 1 May 2008 03:05:10 -0500 Subject: [PATCH] Switch to single makefile. --- FL/Makefile | 27 ---------------------- FL/makefile.inc | 20 ++++++++++++++++ Makefile | 36 ++++++++++++++++++++++++----- Mixer/Makefile | 33 -------------------------- Mixer/makefile.inc | 21 +++++++++++++++++ Timeline/Makefile | 54 ------------------------------------------- Timeline/makefile.inc | 48 ++++++++++++++++++++++++++++++++++++++ make.inc | 18 --------------- 8 files changed, 119 insertions(+), 138 deletions(-) delete mode 100644 FL/Makefile create mode 100644 FL/makefile.inc delete mode 100644 Mixer/Makefile create mode 100644 Mixer/makefile.inc delete mode 100644 Timeline/Makefile create mode 100644 Timeline/makefile.inc delete mode 100644 make.inc diff --git a/FL/Makefile b/FL/Makefile deleted file mode 100644 index 8c59784..0000000 --- a/FL/Makefile +++ /dev/null @@ -1,27 +0,0 @@ - -SRCS= \ - Fl_Scalepack.C \ - Fl_Arc_Dial.C \ - Boxtypes.C \ - -OBJS := $(SRCS:.C=.o) - -INCLUDES=-I.. - -all: libfl_widgets.a - -$(OBJS): Makefile - -include ../make.inc - -libfl_widgets.a: $(OBJS) - ar rcs $@ $(OBJS) -# $(CXX) -static $(CXXFLAGS) $(LIBS) $(OBJS) -o $@ - -clean: - rm -f $(OBJS) mixer makedepend - -valgrind: - valgrind ./test - -include makedepend diff --git a/FL/makefile.inc b/FL/makefile.inc new file mode 100644 index 0000000..7f5c72b --- /dev/null +++ b/FL/makefile.inc @@ -0,0 +1,20 @@ + +FL_SRCS= \ + FL/Fl_Scalepack.C \ + FL/Fl_Arc_Dial.C \ + FL/Boxtypes.C \ + +FL_OBJS := $(FL_SRCS:.C=.o) + +all: FL/libfl_widgets.a + +# $(OBJS): Makefile + +FL/libfl_widgets.a: $(FL_OBJS) + ar rcs $@ $(FL_OBJS) + +.PHONEY: FL +FL: FL/libfl_widgets.a + +FL_clean: + rm -f $(FL_OBJS) FL/libfl_widgets.a diff --git a/Makefile b/Makefile index 8e20835..65dd8e9 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,34 @@ + +FLTK_LIBS := `fltk-config --ldflags` +JACK_LIBS := `pkg-config --libs jack` +SNDFILE_LIBS := `pkg-config --libs sndfile` + CXXFLAGS := -ggdb -Wall -O0 -fno-rtti -fno-exceptions -LIBS := -lsndfile `fltk-config --ldflags` -all: all +all: makedepend FL Timeline Mixer -%: - @ $(MAKE) -s -C FL CXXFLAGS="$(CXXFLAGS)" LIBS="$(LIBS)" $@ - @ $(MAKE) -s -C Timeline CXXFLAGS="$(CXXFLAGS)" LIBS="$(LIBS)" $@ - @ $(MAKE) -s -C Mixer CXXFLAGS="$(CXXFLAGS)" LIBS="$(LIBS)" $@ +.C.o: + @ echo -n "Compiling: "; tput bold; tput setaf 3; echo $<; tput sgr0; true + @ $(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@ + +%.C : %.fl + @ fluid -c $< + + +include FL/makefile.inc +include Timeline/makefile.inc +include Mixer/makefile.inc + +SRCS:=$(FL_SRCS) $(Timeline_SRCS) $(Mixer_SRCS) + +TAGS: $(SRCS) + etags $(SRCS) + +makedepend: $(SRCS) + @ echo -n Checking dependencies... + @ makedepend -f- -- $(CXXFLAGS) -- $(SRCS) > makedepend 2>/dev/null && echo done. + +clean: FL_clean Timeline_clean Mixer_clean + +include makedepend diff --git a/Mixer/Makefile b/Mixer/Makefile deleted file mode 100644 index 4b6b918..0000000 --- a/Mixer/Makefile +++ /dev/null @@ -1,33 +0,0 @@ - -SRCS= \ - DPM.C \ - Mixer_Strip.C \ - Panner.C \ - Mixer.C \ - -OBJS := $(SRCS:.C=.o) - -LIBS := $(LIBS) -L../FL -lfl - -INCLUDES=-I.. - -CXXFLAGS := $(CXXFLAGS) -fPIC - -.PHONEY: all clean install dist valgrind - -all: mixer - -$(OBJS): Makefile - -include ../make.inc - -mixer: $(OBJS) - $(CXX) $(CXXFLAGS) $(LIBS) $(OBJS) -o $@ -L../FL -lfl_widgets - -clean: - rm -f $(OBJS) mixer makedepend - -valgrind: - valgrind ./test - -include makedepend diff --git a/Mixer/makefile.inc b/Mixer/makefile.inc new file mode 100644 index 0000000..14ada21 --- /dev/null +++ b/Mixer/makefile.inc @@ -0,0 +1,21 @@ + +Mixer_SRCS= \ +Mixer/DPM.C \ +Mixer/Mixer_Strip.C \ +Mixer/Panner.C \ +Mixer/Mixer.C \ + +Mixer_OBJS := $(Mixer_SRCS:.C=.o) + +Mixer_LIBS := $(FLTK_LIBS) + +INCLUDES := -I. + +Mixer/mixer: $(Mixer_OBJS) FL + $(CXX) $(CXXFLAGS) $(Mixer_LIBS) $(Mixer_OBJS) -o $@ -LFL -lfl_widgets + +.PHONEY: Mixer +Mixer: Mixer/mixer + +Mixer_clean: + rm -f $(Mixer_OBJS) Mixer/mixer diff --git a/Timeline/Makefile b/Timeline/Makefile deleted file mode 100644 index 05bd44d..0000000 --- a/Timeline/Makefile +++ /dev/null @@ -1,54 +0,0 @@ - -SRCS= \ - Waveform.C \ - Region.C \ - main.C \ - Fl_Menu_Settings.C \ - TLE.C \ - Sequence.C \ - Audio_Sequence.C \ - Control_Sequence.C \ - Timeline.C \ - Track.C \ - Sequence_Widget.C \ - Sequence_Point.C \ - Control_Point.C \ - Tempo_Point.C \ - Time_Point.C \ - Peaks.C \ - Audio_File.C \ - Audio_File_SF.C \ - Port.C \ - Disk_Stream.C \ - Playback_DS.C \ - Record_DS.C \ - dsp.C \ - Engine.C \ - Transport.C \ - Loggable.C \ - -OBJS:=$(SRCS:.C=.o) -# OBJS:=$(OBJS:.c=.o) - -INCLUDES=-I../Engine -I../FL - -.PHONEY: all clean install dist valgrind - -all: timeline - -$(OBJS): Makefile - -include ../make.inc - -#LIBS:=$(LIBS) -ljack -lpthread - -timeline: $(OBJS) - $(CXX) $(CXXFLAGS) $(INCLUDES) $(LIBS) -ljack -lpthread $(OBJS) -o $@ -L../FL -lfl_widgets - -clean: - rm -f $(OBJS) timeline makedepend - -valgrind: - valgrind ./timeline - -include makedepend diff --git a/Timeline/makefile.inc b/Timeline/makefile.inc new file mode 100644 index 0000000..2eb026c --- /dev/null +++ b/Timeline/makefile.inc @@ -0,0 +1,48 @@ + +Timeline_SRCS= \ +Timeline/Audio_File.C \ +Timeline/Audio_File_SF.C \ +Timeline/Audio_Sequence.C \ +Timeline/Control_Point.C \ +Timeline/Control_Sequence.C \ +Timeline/Disk_Stream.C \ +Timeline/Engine.C \ +Timeline/Fl_Menu_Settings.C \ +Timeline/Loggable.C \ +Timeline/Peaks.C \ +Timeline/Playback_DS.C \ +Timeline/Port.C \ +Timeline/Record_DS.C \ +Timeline/Region.C \ +Timeline/Sequence.C \ +Timeline/Sequence_Point.C \ +Timeline/Sequence_Widget.C \ +Timeline/TLE.C \ +Timeline/Tempo_Point.C \ +Timeline/Time_Point.C \ +Timeline/Timeline.C \ +Timeline/Track.C \ +Timeline/Transport.C \ +Timeline/Waveform.C \ +Timeline/dsp.C \ +Timeline/main.C \ + +Timeline_OBJS:=$(Timeline_SRCS:.C=.o) + +$(Timeline_OBJS): Makefile + + +Timeline_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(SNDFILE_LIBS) + +Timeline/timeline: $(Timeline_OBJS) FL + $(CXX) $(CXXFLAGS) $(INCLUDES) $(Timeline_LIBS) $(Timeline_OBJS) -o $@ -LFL -lfl_widgets + +Timeline: Timeline/timeline + +Timeline_clean: + rm -f $(Timeline_OBJS) Timeline/timeline + +# valgrind: +# valgrind ./timeline + +# include makedepend diff --git a/make.inc b/make.inc deleted file mode 100644 index 8f10ab7..0000000 --- a/make.inc +++ /dev/null @@ -1,18 +0,0 @@ - -# To be included in all makefiles - -.C.o: - @ echo -n "Compiling: "; tput bold; tput setaf 3; echo $<; tput sgr0; true - @ $(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@ - -%.C : %.fl - @ fluid -c $< - -TAGS: $(SRCS) - etags $(SRCS) - -makedepend: $(SRCS) - @ echo -n Checking dependencies... - @ makedepend -f- -- $(CXXFLAGS) -- $(SRCS) > makedepend 2>/dev/null && echo done. - -all: makedepend