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

diff --git a/Makefile b/Makefile
index 4bbcb12..fe6f657 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,13 @@
 # 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)
 
@@ -13,10 +15,13 @@ TESTRUNNER := $(ECHO)
 WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
 	-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
 	-Wmissing-declarations -Wnested-externs -pedantic
-# BeOS/Haiku standard library headers create warnings
+# BeOS/Haiku/AmigaOS standard library headers create warnings
 ifneq ($(TARGET),beos)
-  WARNFLAGS := $(WARNFLAGS) -Werror
+  ifneq ($(TARGET),amiga)
+    WARNFLAGS := $(WARNFLAGS) -Werror
+  endif
 endif
+
 CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
 	-I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)
 ifneq ($(GCCVER),2)
@@ -26,18 +31,18 @@ else
   CFLAGS := $(CFLAGS) -Dinline="__inline__"
 endif
 
-# LibXML2
+# libdom
 ifneq ($(PKGCONFIG),)
   CFLAGS := $(CFLAGS) \
-		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags libxml-2.0)
-  LDFLAGS := $(LDFLAGS) \
-		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs libxml-2.0)
+		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags libdom libwapcaplet)
+  LDFLAGS := $(LDFLAGS) -lm \
+		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs libdom libwapcaplet)
 else
-  CFLAGS := $(CFLAGS) -I$(PREFIX)/include/libxml2
-  LDFLAGS := $(CFLAGS) -lxml2
+  CFLAGS := $(CFLAGS) -I$(PREFIX)/include
+  LDFLAGS := $(CFLAGS) -ldom -lwapcaplet -lexpat -lm
 endif
 
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
 
 # Extra installation rules
 I := /include