From a835237b9cd99018a49b231c800787e4db9a5296 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Fri, 30 Nov 2012 14:41:27 +0100 Subject: [PATCH] Enabled the tests by default --- Makefile | 7 ++++++- project.conf | 2 +- src/Makefile | 1 + tests/Makefile | 1 + tests/project.conf | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b39e52d..4f5a7f4 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ PACKAGE = C99 VERSION = 0.0.0 -SUBDIRS = data doc include src +SUBDIRS = data doc include src tests RM ?= rm -f LN ?= ln -f TAR ?= tar -czvf @@ -123,6 +123,11 @@ dist: $(PACKAGE)-$(VERSION)/src/target/asm/i586.c \ $(PACKAGE)-$(VERSION)/src/target/asm/i686.c \ $(PACKAGE)-$(VERSION)/src/target/project.conf \ + $(PACKAGE)-$(VERSION)/tests/hello.c \ + $(PACKAGE)-$(VERSION)/tests/struct.c \ + $(PACKAGE)-$(VERSION)/tests/union.c \ + $(PACKAGE)-$(VERSION)/tests/Makefile \ + $(PACKAGE)-$(VERSION)/tests/project.conf \ $(PACKAGE)-$(VERSION)/Makefile \ $(PACKAGE)-$(VERSION)/config.h \ $(PACKAGE)-$(VERSION)/config.sh \ diff --git a/project.conf b/project.conf index e98a93c..23f37b9 100644 --- a/project.conf +++ b/project.conf @@ -2,5 +2,5 @@ package=C99 version=0.0.0 config=h,sh -subdirs=data,doc,include,src +subdirs=data,doc,include,src,tests dist=Makefile,config.h,config.sh diff --git a/src/Makefile b/src/Makefile index 52e1372..b956219 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,6 +3,7 @@ TARGETS = c99 PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin +SBINDIR = $(PREFIX)/sbin CC ?= cc CPPFLAGSF?= CPPFLAGS= diff --git a/tests/Makefile b/tests/Makefile index 3bf2e5f..811ea19 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -2,6 +2,7 @@ TARGETS = hello struct union PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin +SBINDIR = $(PREFIX)/sbin CC = ../src/c99 CPPFLAGSF?= CPPFLAGS?= diff --git a/tests/project.conf b/tests/project.conf index 3bf029a..fea11bc 100644 --- a/tests/project.conf +++ b/tests/project.conf @@ -2,6 +2,7 @@ targets=hello,struct,union cflags_force=-W cflags= cc=../src/c99 +dist=Makefile [hello] type=object