diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2009-04-21 23:14:10 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-04-21 23:14:10 +0000 |
| commit | bd08ce1d06042db0450c4e71dcc5e1c2db95543d (patch) | |
| tree | de5654dd04f60e80f9156578496edf49b5c4138f | |
| parent | 05a79383030f30453b0d761e659b5a8c5d8e2eb8 (diff) | |
| download | libcss-bd08ce1d06042db0450c4e71dcc5e1c2db95543d.tar.gz libcss-bd08ce1d06042db0450c4e71dcc5e1c2db95543d.tar.bz2 | |
Sync with core buildsystem
svn path=/trunk/libcss/; revision=7228
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | libcss.pc.in | 7 |
2 files changed, 8 insertions, 10 deletions
@@ -27,18 +27,17 @@ endif # Parserutils & wapcaplet ifneq ($(PKGCONFIG),) - CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libparserutils-0 libwapcaplet-0 --cflags) - LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libparserutils-0 libwapcaplet-0 --libs) + CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libparserutils libwapcaplet --cflags) + LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libparserutils libwapcaplet --libs) else - CFLAGS := $(CFLAGS) -I$(PREFIX)/include/parserutils0 \ - -I$(PREFIX)/include/wapcaplet0 - LDFLAGS := $(LDFLAGS) -lparserutils0 -lwapcaplet0 + CFLAGS := $(CFLAGS) -I$(PREFIX)/include + LDFLAGS := $(LDFLAGS) -lparserutils -lwapcaplet endif include build/makefiles/Makefile.top # Extra installation rules -I := /include/libcss$(major-version)/libcss +I := /include/libcss INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/computed.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/errors.h diff --git a/libcss.pc.in b/libcss.pc.in index e3c520e..46155a8 100644 --- a/libcss.pc.in +++ b/libcss.pc.in @@ -6,7 +6,6 @@ includedir=${prefix}/include Name: libcss Description: CSS parsing and selection library Version: VERSION -Requires: libparserutils-0, libwapcaplet-0 -Libs: -L${libdir} -lcssMAJOR -Cflags: -I${includedir}/libcssMAJOR - +Requires: libparserutils, libwapcaplet +Libs: -L${libdir} -lcss +Cflags: -I${includedir} |