From e5e59f8ce8c95f01f011f945cfb844dfe79adaa5 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 3 Nov 2011 17:44:33 +0100 Subject: small fixes around ENABLE_THREADS --- makefiles/gmake/platform.mk | 2 +- src/GNUmakefile | 9 +++++++-- tests/GNUmakefile | 4 +++- tests/library/GNUmakefile | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/makefiles/gmake/platform.mk b/makefiles/gmake/platform.mk index b72bc07..79ad2e3 100644 --- a/makefiles/gmake/platform.mk +++ b/makefiles/gmake/platform.mk @@ -227,7 +227,7 @@ PLATFORM_COMPILE_FLAGS += $(INCLUDE_FLAGS_NET) # enable or disable threading ENABLE_THREADS ?= 1 -ifeq "$(ENABLE_NLS)" "1" +ifeq "$(ENABLE_THREADS)" "1" PLATFORM_COMPILE_FLAGS += \ -DENABLE_THREADS=$(ENABLE_THREADS) endif diff --git a/src/GNUmakefile b/src/GNUmakefile index 448fc2e..6a0f32e 100644 --- a/src/GNUmakefile +++ b/src/GNUmakefile @@ -2,15 +2,18 @@ TOPDIR = .. SUBDIRS = +-include $(TOPDIR)/makefiles/gmake/platform.mk + INCLUDE_DIRS = -I$(TOPDIR)/include/wolf -I. BINS = -THREADING_OBJS = ifeq "$(ENABLE_THREADS)" "1" -THREADING_OBJS = $(THREADING_OBJS) \ +THREADING_OBJS = \ threads/mutex.o \ threads/threads.o +else +THREADING_OBJS = endif PORT_OBJS = \ @@ -77,7 +80,9 @@ local_clean: -@rm -f daemon/*.bak -@rm -f daemon/*~ -@rm -f daemon/*.d +ifeq "$(ENABLE_THREADS)" "1" -@rm -f threads/*.bak +endif -@rm -f threads/*~ -@rm -f threads/*.d -@rm -f library/*.bak diff --git a/tests/GNUmakefile b/tests/GNUmakefile index e2d4b28..6462a9c 100644 --- a/tests/GNUmakefile +++ b/tests/GNUmakefile @@ -1,9 +1,11 @@ TOPDIR = .. +-include $(TOPDIR)/makefiles/gmake/platform.mk + SUBDIRS = port log gettext network daemon service library ifeq "$(ENABLE_THREADS)" "1" -SUBDIRS = $(SUBDIRS) threads +SUBDIRS += threads endif -include $(TOPDIR)/makefiles/gmake/sub.mk diff --git a/tests/library/GNUmakefile b/tests/library/GNUmakefile index 7b63f04..85c5234 100644 --- a/tests/library/GNUmakefile +++ b/tests/library/GNUmakefile @@ -23,6 +23,7 @@ test_loader$(EXE): $(TOPDIR)/src/libwolf.a $(DYNAMIC_LIB).$(DYNAMIC_LIB_MAJOR).$ local_all: local_clean: + @-rm -f testlib.so.0.0.0 local_distclean: -- cgit v1.2.3-54-g00ecf