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

diff --git a/Makefile b/Makefile
index 40dc091..4bbcb12 100644
--- a/Makefile
+++ b/Makefile
@@ -7,12 +7,15 @@ COMPONENT_TYPE ?= lib-static
 # Setup the tooling
 include build/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 standard library headers create warnings
+ifneq ($(TARGET),beos)
+  WARNFLAGS := $(WARNFLAGS) -Werror
 endif
 CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
 	-I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)
@@ -23,6 +26,17 @@ else
   CFLAGS := $(CFLAGS) -Dinline="__inline__"
 endif
 
+# LibXML2
+ifneq ($(PKGCONFIG),)
+  CFLAGS := $(CFLAGS) \
+		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags libxml-2.0)
+  LDFLAGS := $(LDFLAGS) \
+		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs libxml-2.0)
+else
+  CFLAGS := $(CFLAGS) -I$(PREFIX)/include/libxml2
+  LDFLAGS := $(CFLAGS) -lxml2
+endif
+
 include build/makefiles/Makefile.top
 
 # Extra installation rules