diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2011-11-03 17:44:33 +0100 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2011-11-03 17:44:33 +0100 |
| commit | e5e59f8ce8c95f01f011f945cfb844dfe79adaa5 (patch) | |
| tree | 91aaa9678f7c92230c338851ceed897147c9cd46 | |
| parent | 162da0ff4f11598bd6999ab78be26f75545f5991 (diff) | |
| download | wolfbones-e5e59f8ce8c95f01f011f945cfb844dfe79adaa5.tar.gz wolfbones-e5e59f8ce8c95f01f011f945cfb844dfe79adaa5.tar.bz2 | |
small fixes around ENABLE_THREADS
| -rw-r--r-- | makefiles/gmake/platform.mk | 2 | ||||
| -rw-r--r-- | src/GNUmakefile | 9 | ||||
| -rw-r--r-- | tests/GNUmakefile | 4 | ||||
| -rw-r--r-- | 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: |