From f46b85b4bc66aa6ee4d08558ef942de049a0339a Mon Sep 17 00:00:00 2001 From: Harry van Haaren Date: Mon, 16 Sep 2013 19:52:09 +0100 Subject: [PATCH] -Removed Tup leftovers --- Tupfile | 14 -------------- build/tup.config | 2 -- buildTest/tup.config | 4 ---- fixTup.sh | 8 -------- src/Tupfile | 16 ---------------- src/avtk/Tupfile | 16 ---------------- src/cjson/Tupfile | 16 ---------------- src/controller/Tupfile | 9 --------- src/dsp/Tupfile | 9 --------- src/observer/Tupfile | 9 --------- src/state/Tupfile | 9 --------- src/tests/Tupfile | 13 ------------- 12 files changed, 125 deletions(-) delete mode 100644 Tupfile delete mode 100644 build/tup.config delete mode 100644 buildTest/tup.config delete mode 100755 fixTup.sh delete mode 100644 src/Tupfile delete mode 100644 src/avtk/Tupfile delete mode 100644 src/cjson/Tupfile delete mode 100644 src/controller/Tupfile delete mode 100644 src/dsp/Tupfile delete mode 100644 src/observer/Tupfile delete mode 100644 src/state/Tupfile delete mode 100644 src/tests/Tupfile diff --git a/Tupfile b/Tupfile deleted file mode 100644 index 8252fe4..0000000 --- a/Tupfile +++ /dev/null @@ -1,14 +0,0 @@ - -# Linking / final steps for Luppp - -# GENERAL -LDFLAGS +=`pkg-config --libs jack sndfile cairomm-1.0 ntk ntk_images` - -# CONFIGURE -ifeq (@(LUPPP_BUILD_TESTS),y) -LDFLAGS +=-lgcov -endif - -# LINK -: src/*.o src/avtk/*.o src/cjson/*.o src/controller/*.o src/dsp/*.o src/observer/*.o src/state/*.o src/tests/*.o \ - |> g++ %f $(LDFLAGS) -o %o && touch build.success |> luppp | build.success diff --git a/build/tup.config b/build/tup.config deleted file mode 100644 index 7c79241..0000000 --- a/build/tup.config +++ /dev/null @@ -1,2 +0,0 @@ - -# no build flags for release mode diff --git a/buildTest/tup.config b/buildTest/tup.config deleted file mode 100644 index c5dfd39..0000000 --- a/buildTest/tup.config +++ /dev/null @@ -1,4 +0,0 @@ - -# no build flags for release mode - -CONFIG_LUPPP_BUILD_TESTS=y diff --git a/fixTup.sh b/fixTup.sh deleted file mode 100755 index ee7e997..0000000 --- a/fixTup.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -# sometimes Tup gives errors on FUSE mount or something -# just deleting .tup/mnt/* makes tup re-mount things, fixing it: - -rm -rf .tup/mnt/* -rm -rf build/src/* -rm -rf buildTest/src/* diff --git a/src/Tupfile b/src/Tupfile deleted file mode 100644 index b2ec600..0000000 --- a/src/Tupfile +++ /dev/null @@ -1,16 +0,0 @@ - -# Tup build file for Luppp - -# GENERAL -OUTPUT=%B.o -CFLAGS += -g -Wall -march=native -msse -mfpmath=sse -ffast-math -INCLUDES += `pkg-config --cflags jack sndfile cairomm-1.0 ntk ntk_images` - - -ifeq (@(LUPPP_BUILD_TESTS),y) -OUTPUT+=| %B.gcno -CFLAGS += -fprofile-arcs -ftest-coverage -DBUILD_TESTS -DBUILD_COVERAGE_TEST -DDEBUG_KILL_ON_ERR -endif - -# COMPILE -: foreach *.cxx |> g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> $(OUTPUT) diff --git a/src/avtk/Tupfile b/src/avtk/Tupfile deleted file mode 100644 index b2ec600..0000000 --- a/src/avtk/Tupfile +++ /dev/null @@ -1,16 +0,0 @@ - -# Tup build file for Luppp - -# GENERAL -OUTPUT=%B.o -CFLAGS += -g -Wall -march=native -msse -mfpmath=sse -ffast-math -INCLUDES += `pkg-config --cflags jack sndfile cairomm-1.0 ntk ntk_images` - - -ifeq (@(LUPPP_BUILD_TESTS),y) -OUTPUT+=| %B.gcno -CFLAGS += -fprofile-arcs -ftest-coverage -DBUILD_TESTS -DBUILD_COVERAGE_TEST -DDEBUG_KILL_ON_ERR -endif - -# COMPILE -: foreach *.cxx |> g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> $(OUTPUT) diff --git a/src/cjson/Tupfile b/src/cjson/Tupfile deleted file mode 100644 index 0cbf346..0000000 --- a/src/cjson/Tupfile +++ /dev/null @@ -1,16 +0,0 @@ - -# Tup build file for Luppp - -# GENERAL -OUTPUT=%B.o -CFLAGS += -g -Wall -march=native -msse -mfpmath=sse -ffast-math -INCLUDES += `pkg-config --cflags jack sndfile cairomm-1.0 ntk ntk_images` - - -ifeq (@(LUPPP_BUILD_TESTS),y) -OUTPUT+=| %B.gcno -CFLAGS += -fprofile-arcs -ftest-coverage -DBUILD_TESTS -DBUILD_COVERAGE_TEST -DDEBUG_KILL_ON_ERR -endif - -# COMPILE -: foreach *.c |> g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> $(OUTPUT) diff --git a/src/controller/Tupfile b/src/controller/Tupfile deleted file mode 100644 index fd3cb34..0000000 --- a/src/controller/Tupfile +++ /dev/null @@ -1,9 +0,0 @@ - -# Tup build file for Luppp - -# GENERAL -CFLAGS += -g -Wall -march=native -msse -mfpmath=sse -ffast-math -INCLUDES += `pkg-config --cflags jack sndfile cairomm-1.0 ntk ntk_images` - -# COMPILE -: foreach *.cxx |> ^c^ g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> %B.o diff --git a/src/dsp/Tupfile b/src/dsp/Tupfile deleted file mode 100644 index fd3cb34..0000000 --- a/src/dsp/Tupfile +++ /dev/null @@ -1,9 +0,0 @@ - -# Tup build file for Luppp - -# GENERAL -CFLAGS += -g -Wall -march=native -msse -mfpmath=sse -ffast-math -INCLUDES += `pkg-config --cflags jack sndfile cairomm-1.0 ntk ntk_images` - -# COMPILE -: foreach *.cxx |> ^c^ g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> %B.o diff --git a/src/observer/Tupfile b/src/observer/Tupfile deleted file mode 100644 index fd3cb34..0000000 --- a/src/observer/Tupfile +++ /dev/null @@ -1,9 +0,0 @@ - -# Tup build file for Luppp - -# GENERAL -CFLAGS += -g -Wall -march=native -msse -mfpmath=sse -ffast-math -INCLUDES += `pkg-config --cflags jack sndfile cairomm-1.0 ntk ntk_images` - -# COMPILE -: foreach *.cxx |> ^c^ g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> %B.o diff --git a/src/state/Tupfile b/src/state/Tupfile deleted file mode 100644 index 8239afc..0000000 --- a/src/state/Tupfile +++ /dev/null @@ -1,9 +0,0 @@ - -# Tup build file for Luppp - -# GENERAL -CFLAGS += -g -Wall -march=native -msse -mfpmath=sse -ffast-math -INCLUDES += `pkg-config --cflags jack sndfile cairomm-1.0 ntk ntk_images` - -# COMPILE -: foreach *.cxx |> g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> %B.o diff --git a/src/tests/Tupfile b/src/tests/Tupfile deleted file mode 100644 index 3f88a68..0000000 --- a/src/tests/Tupfile +++ /dev/null @@ -1,13 +0,0 @@ - -# Tup build file for Luppp - -# GENERAL -CFLAGS += -g -Wall -march=native -msse -mfpmath=sse -ffast-math -INCLUDES += `pkg-config --cflags jack sndfile cairomm-1.0 ntk ntk_images` - - -# CONFIGURE -ifeq (@(LUPPP_BUILD_TESTS),y) -CFLAGS += -fprofile-arcs -ftest-coverage -DBUILD_TESTS -DBUILD_COVERAGE_TEST -DDEBUG_KILL_ON_ERR -: foreach *.cxx |> g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> %B.o | %B.gcno -endif