X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=Makefile;h=fe6f657c9830ac5f3119c829c4f9bc5980004ff3;hb=e368730948266bb88347ace7a1da642a4f8781a2;hp=40dc091437f50b03d15a0d5e95df99f75ce853e0;hpb=15cdb30e3125ce542289fe385f559799e5abf220;p=libsvgtiny.git

diff --git a/Makefile b/Makefile
index 40dc091..fe6f657 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,27 @@
 # Component settings
 COMPONENT := svgtiny
-COMPONENT_VERSION := 0.0.1
+COMPONENT_VERSION := 0.1.0
 # Default to a static library
 COMPONENT_TYPE ?= lib-static
 
 # Setup the tooling
-include build/makefiles/Makefile.tools
+PREFIX ?= /opt/netsurf
+NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
+include $(NSSHARED)/makefiles/Makefile.tools
+
+TESTRUNNER := $(ECHO)
 
 # Toolchain flags
-WARNFLAGS := -Wall -Wundef -Wpointer-arith -Wcast-align \
+WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
 	-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
-	-Wmissing-declarations -Wnested-externs -Werror -pedantic
-ifneq ($(GCCVER),2)
-  WARNFLAGS := $(WARNFLAGS) -Wextra
+	-Wmissing-declarations -Wnested-externs -pedantic
+# BeOS/Haiku/AmigaOS standard library headers create warnings
+ifneq ($(TARGET),beos)
+  ifneq ($(TARGET),amiga)
+    WARNFLAGS := $(WARNFLAGS) -Werror
+  endif
 endif
+
 CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
 	-I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)
 ifneq ($(GCCVER),2)
@@ -23,7 +31,18 @@ else
   CFLAGS := $(CFLAGS) -Dinline="__inline__"
 endif
 
-include build/makefiles/Makefile.top
+# libdom
+ifneq ($(PKGCONFIG),)
+  CFLAGS := $(CFLAGS) \
+		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags libdom libwapcaplet)
+  LDFLAGS := $(LDFLAGS) -lm \
+		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs libdom libwapcaplet)
+else
+  CFLAGS := $(CFLAGS) -I$(PREFIX)/include
+  LDFLAGS := $(CFLAGS) -ldom -lwapcaplet -lexpat -lm
+endif
+
+include $(NSBUILD)/Makefile.top
 
 # Extra installation rules
 I := /include