diff options
author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2012-11-03 17:51:55 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2012-11-03 17:51:55 +0000 |
commit | 9275ab30890fe7def93dcfe913c9209d32c2d00e (patch) | |
tree | e2b5f1697a7f89401abb457a8d1b7df773564606 /Makefile | |
parent | b9b4c3c90eea9b00da17d0cbdce195d715fdb01a (diff) | |
parent | dc1d99abcc35fd50673ed009d9247ef976beed4f (diff) | |
download | libsvgtiny-9275ab30890fe7def93dcfe913c9209d32c2d00e.tar.gz libsvgtiny-9275ab30890fe7def93dcfe913c9209d32c2d00e.tar.bz2 |
Merge branch 'dsilvers/tolibdom'
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -31,18 +31,15 @@ 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 - ifeq ($(TARGET),beos) - CFLAGS := $(CFLAGS) -I/boot/home/config/include/libxml2 - endif - CFLAGS := $(CFLAGS) -I$(PREFIX)/include/libxml2 - LDFLAGS := $(CFLAGS) -lxml2 + CFLAGS := $(CFLAGS) -I$(PREFIX)/include + LDFLAGS := $(CFLAGS) -ldom -lwapcaplet -lexpat -lm endif include $(NSBUILD)/Makefile.top |