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

Makefile cleanups.

This commit is contained in:
Jonathan Moore Liles 2008-05-16 21:50:33 -05:00
parent 24f935d957
commit 251d7f9267
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -9,7 +9,7 @@
VERSION := 0.5.0 VERSION := 0.5.0
all: makedepend FL Timeline Mixer all: FL Timeline Mixer
make.conf: configure make.conf: configure
@ ./configure @ ./configure
@ -27,7 +27,7 @@ CXXFLAGS += $(LASH_CFLAGS) -DINSTALL_PREFIX=\"$(prefix)\" -DVERSION=\"$(VERSION)
include scripts/colors include scripts/colors
.C.o: .C.o:
@ echo -n "Compiling: "; echo $(BOLD)$(YELLOW)$<$(SGR0); true @ echo "Compiling: $(BOLD)$(YELLOW)$<$(SGR0)"
@ $(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@ @ $(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@
%.C : %.fl %.C : %.fl
@ -39,7 +39,7 @@ include FL/makefile.inc
include Timeline/makefile.inc include Timeline/makefile.inc
include Mixer/makefile.inc include Mixer/makefile.inc
SRCS:=$(FL_SRCS) $(Timeline_SRCS) $(Mixer_SRCS) SRCS:=$(Timeline_SRCS) $(FL_SRCS) $(Mixer_SRCS)
OBJS:=$(FL_OBJS) $(Timeline_OBJS) $(Mixer_OBJS) OBJS:=$(FL_OBJS) $(Timeline_OBJS) $(Mixer_OBJS)
# FIXME: isn't there a better way? # FIXME: isn't there a better way?
@ -48,10 +48,9 @@ $(OBJS): make.conf
TAGS: $(SRCS) TAGS: $(SRCS)
etags $(SRCS) etags $(SRCS)
#makedepend: $(SRCS) Makefile
makedepend: $(SRCS) makedepend: $(SRCS)
@ echo -n Checking dependencies... @ echo -n Checking dependencies...
@ makedepend -f- -- $(CXXFLAGS) -- $(SRCS) > makedepend 2>/dev/null && echo done. @ makedepend -f- -- $(CXXFLAGS) -I. -IFL -ITimeline -IMixer -- $(SRCS) > makedepend 2>/dev/null && echo $(DONE)
.PHONEY: clean config .PHONEY: clean config

7
Timeline/makefile.inc
View File

@ -36,7 +36,7 @@ Timeline/Transport.C \
Timeline/Waveform.C \ Timeline/Waveform.C \
Timeline/dsp.C \ Timeline/dsp.C \
Timeline/main.C \ Timeline/main.C \
debug.C debug.C \
Timeline_OBJS:=$(Timeline_SRCS:.C=.o) Timeline_OBJS:=$(Timeline_SRCS:.C=.o)
@ -53,8 +53,3 @@ Timeline: Timeline/timeline
Timeline_clean: Timeline_clean:
rm -f $(Timeline_OBJS) Timeline/timeline rm -f $(Timeline_OBJS) Timeline/timeline
# valgrind:
# valgrind ./timeline
# include makedepend