Cleanup build.

This commit is contained in:
Jonathan Moore Liles 2008-05-18 12:00:27 -05:00
parent 6edd388722
commit a7fe4c5348
2 changed files with 13 additions and 3 deletions

View File

@ -9,7 +9,7 @@
VERSION := 0.5.0 VERSION := 0.5.0
all: FL Timeline Mixer all: make.conf FL Timeline Mixer
make.conf: configure make.conf: configure
@ ./configure @ ./configure
@ -17,7 +17,7 @@ make.conf: configure
-include make.conf -include make.conf
ifeq ($(USE_DEBUG),yes) ifeq ($(USE_DEBUG),yes)
CXXFLAGS := -pipe -ggdb -Wextra -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 -O3 -fno-rtti -fno-exceptions -DNDEBUG
endif endif
@ -48,7 +48,7 @@ $(OBJS): make.conf
TAGS: $(SRCS) TAGS: $(SRCS)
etags $(SRCS) etags $(SRCS)
makedepend: $(SRCS) makedepend: make.conf $(SRCS)
@ echo -n Checking dependencies... @ echo -n Checking 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)

View File

@ -161,9 +161,19 @@ test_version ()
local IFS local IFS
IFS='.' IFS='.'
if [ $2 != -ge ] && [ $2 != -le ]
then
fatal "Syntax error"
fi
_test_version $1 $2 $3 _test_version $1 $2 $3
} }
version_of ()
{
echo `pkg-config --modversion $1`
}
require_FLTK () require_FLTK ()
{ {
local use local use