Makefile: cleanup, fix typo.

This commit is contained in:
Jonathan Moore Liles 2008-05-21 10:20:01 -05:00
parent fc6ffee22e
commit bfcb2f11b9
1 changed files with 6 additions and 6 deletions

View File

@ -1,7 +1,7 @@
# Makefile for the Non-DAW. # Makefile for the Non-DAW.
# Copyright 2008 Jonathan Moore Liles # Copyright 2008 Jonathan Moore Liles
# This file is licencesd under version 2 of the GPL. # This file is licensed under version 2 of the GPL.
# #
# Do not edit this file; run `make config` instead. # Do not edit this file; run `make config` instead.
@ -14,12 +14,15 @@ all: make.conf FL Timeline Mixer
make.conf: configure make.conf: configure
@ ./configure @ ./configure
config:
@ ./configure
-include make.conf -include make.conf
ifeq ($(USE_DEBUG),yes) ifeq ($(USE_DEBUG),yes)
CXXFLAGS := -pipe -ggdb -Wall -Wextra -Wnon-virtual-dtor -Wno-missing-field-initializers -O0 -fno-rtti -fno-exceptions CXXFLAGS := -pipe -ggdb -Wall -Wextra -Wnon-virtual-dtor -Wno-missing-field-initializers -O0 -fno-rtti -fno-exceptions
else else
CXXFLAGS := -pipe -O3 -fno-rtti -fno-exceptions -DNDEBUG CXXFLAGS := -pipe -O2 -fno-rtti -fno-exceptions -DNDEBUG
endif endif
CXXFLAGS += $(SNDFILE_CFLAGS) $(LASH_CFLAGS) $(FLTK_CFLAGS) -DINSTALL_PREFIX="\"$(prefix)\"" -DVERSION=\"$(VERSION)\" CXXFLAGS += $(SNDFILE_CFLAGS) $(LASH_CFLAGS) $(FLTK_CFLAGS) -DINSTALL_PREFIX="\"$(prefix)\"" -DVERSION=\"$(VERSION)\"
@ -49,14 +52,11 @@ TAGS: $(SRCS)
etags $(SRCS) etags $(SRCS)
makedepend: make.conf $(SRCS) makedepend: make.conf $(SRCS)
@ echo -n Checking dependencies... @ echo -n Calculating dependencies...
@ makedepend -f- -- $(CXXFLAGS) -I. -IFL -ITimeline -IMixer -- $(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
clean: FL_clean Timeline_clean Mixer_clean clean: FL_clean Timeline_clean Mixer_clean
config:
@ ./configure
-include makedepend -include makedepend