summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-03-24 16:11:14 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-03-24 16:11:14 +0000
commitb051ab9d7aa7c8b9689ca4464ae73a21d916c209 (patch)
treef7051afd9a05c2e80339f278f521cedf79662abe /Makefile
parent54fd5efc8b5887c06d98eec3f3c6c9c21d28cb57 (diff)
downloadlibhubbub-b051ab9d7aa7c8b9689ca4464ae73a21d916c209.tar.gz
libhubbub-b051ab9d7aa7c8b9689ca4464ae73a21d916c209.tar.bz2
Sync with core.
svn path=/trunk/hubbub/; revision=6844
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile23
1 files changed, 10 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 0e279f4..824c134 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
# Component settings
COMPONENT := hubbub
-COMPONENT_TYPE := lib-static
+# Default to a static library
+COMPONENT_TYPE ?= lib-static
-# Build settings
-TARGET := nix
-LIBEXT := .a
+# Setup the tooling
+include build/makefiles/Makefile.tools
# Toolchain flags
WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
@@ -13,18 +13,15 @@ WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
CFLAGS := $(CFLAGS) -std=c99 -D_BSD_SOURCE -I$(CURDIR)/include/ \
-I$(CURDIR)/src $(WARNFLAGS)
-include build/makefiles/Makefile.top
-
-# Further toolchain settings which rely on Makefile.top
-CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libparserutils --cflags)
-LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libparserutils --libs)
-
-ifeq ($(BUILD),release)
- CFLAGS := $(CFLAGS) -DNDEBUG -O2
+ifneq ($(PKGCONFIG),)
+ CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libparserutils --cflags)
+ LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libparserutils --libs)
else
- CFLAGS := $(CFLAGS) -g -O0
+ LDFLAGS := -lparserutils
endif
+include build/makefiles/Makefile.top
+
# Extra installation rules
INSTALL_ITEMS := $(INSTALL_ITEMS) /include/hubbub:include/hubbub/errors.h
INSTALL_ITEMS := $(INSTALL_ITEMS) /include/hubbub:include/hubbub/functypes.h