From bd08ce1d06042db0450c4e71dcc5e1c2db95543d Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Tue, 21 Apr 2009 23:14:10 +0000 Subject: Sync with core buildsystem svn path=/trunk/libcss/; revision=7228 --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ed5d707..908f339 100644 --- a/Makefile +++ b/Makefile @@ -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 -- cgit v1.2.3