From a7fe4c53484e4531acbd70aee01416b8ed60ab07 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Sun, 18 May 2008 12:00:27 -0500 Subject: [PATCH] Cleanup build. --- Makefile | 6 +++--- scripts/config-funcs | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e77f40c..5985e47 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ VERSION := 0.5.0 -all: FL Timeline Mixer +all: make.conf FL Timeline Mixer make.conf: configure @ ./configure @@ -17,7 +17,7 @@ make.conf: configure -include make.conf 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 CXXFLAGS := -pipe -O3 -fno-rtti -fno-exceptions -DNDEBUG endif @@ -48,7 +48,7 @@ $(OBJS): make.conf TAGS: $(SRCS) etags $(SRCS) -makedepend: $(SRCS) +makedepend: make.conf $(SRCS) @ echo -n Checking dependencies... @ makedepend -f- -- $(CXXFLAGS) -I. -IFL -ITimeline -IMixer -- $(SRCS) > makedepend 2>/dev/null && echo $(DONE) diff --git a/scripts/config-funcs b/scripts/config-funcs index 5fd771e..229707a 100644 --- a/scripts/config-funcs +++ b/scripts/config-funcs @@ -161,9 +161,19 @@ test_version () local IFS IFS='.' + if [ $2 != -ge ] && [ $2 != -le ] + then + fatal "Syntax error" + fi + _test_version $1 $2 $3 } +version_of () +{ + echo `pkg-config --modversion $1` +} + require_FLTK () { local use