aboutsummaryrefslogtreecommitdiff
path: root/package/cairo
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2007-01-11 07:35:59 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2007-01-11 07:35:59 +0000
commit135ad187ff0ffd712e601fa2a9aff7bf1451b481 (patch)
treef5727bf66aa1e84b92db552c7e6be3e19dae44a3 /package/cairo
parent2830e6fb551dd66f7bb2411c7db80e83f49f2cd1 (diff)
downloadbuildroot-135ad187ff0ffd712e601fa2a9aff7bf1451b481.tar.gz
buildroot-135ad187ff0ffd712e601fa2a9aff7bf1451b481.tar.bz2
fix build deps
Diffstat (limited to 'package/cairo')
-rw-r--r--package/cairo/cairo.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 85b20d97d7..ba46917eed 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -8,7 +8,7 @@ CAIRO_SOURCE:=cairo-$(CAIRO_VERSION).tar.gz
CAIRO_SITE:=http://cairographics.org/releases
CAIRO_CAT:=$(ZCAT)
CAIRO_DIR:=$(BUILD_DIR)/cairo-$(CAIRO_VERSION)
-CAIRO_BINARY:=libcairo-1.0.a
+CAIRO_BINARY:=libcairo.a
ifeq ($(BR2_ENDIAN),"BIG")
CAIRO_BE:=yes
@@ -119,11 +119,11 @@ $(CAIRO_DIR)/.configured: $(CAIRO_DIR)/.unpacked
);
touch $(CAIRO_DIR)/.configured
-$(CAIRO_DIR)/cairo/.libs/$(CAIRO_BINARY): $(CAIRO_DIR)/.configured
+$(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY): $(CAIRO_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) -C $(CAIRO_DIR)
- touch -c $(CAIRO_DIR)/cairo/.libs/$(CAIRO_BINARY)
+ touch -c $(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY)
-$(STAGING_DIR)/lib/$(CAIRO_BINARY): $(CAIRO_DIR)/cairo/.libs/$(CAIRO_BINARY)
+$(STAGING_DIR)/lib/$(CAIRO_BINARY): $(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY)
$(MAKE) prefix=$(STAGING_DIR) \
exec_prefix=$(STAGING_DIR) \
bindir=$(STAGING_DIR)/bin \
@@ -139,6 +139,7 @@ $(STAGING_DIR)/lib/$(CAIRO_BINARY): $(CAIRO_DIR)/cairo/.libs/$(CAIRO_BINARY)
infodir=$(STAGING_DIR)/info \
mandir=$(STAGING_DIR)/man \
-C $(CAIRO_DIR) install;
+ touch -c $(STAGING_DIR)/lib/$(CAIRO_BINARY)
$(TARGET_DIR)/lib/libcairo.so.2.9.3: $(STAGING_DIR)/lib/$(CAIRO_BINARY)
cp -a $(STAGING_DIR)/lib/libcairo.so $(TARGET_DIR)/lib/
@@ -146,7 +147,7 @@ $(TARGET_DIR)/lib/libcairo.so.2.9.3: $(STAGING_DIR)/lib/$(CAIRO_BINARY)
$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libcairo.so.2.*
touch -c $(TARGET_DIR)/lib/libcairo.so.2.9.3
-cairo: uclibc gettext libintl pkgconfig libglib2 xorg cairo $(TARGET_DIR)/lib/libcairo.so.2.9.3
+cairo: uclibc gettext libintl pkgconfig libglib2 xorg $(TARGET_DIR)/lib/libcairo.so.2.9.3
cairo-clean:
rm -f $(TARGET_DIR)/lib/$(CAIRO_BINARY)