projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2830e6f)
fix build deps
authorEric Andersen <andersen@codepoet.org>
Thu, 11 Jan 2007 07:35:59 +0000 (07:35 -0000)
committerEric Andersen <andersen@codepoet.org>
Thu, 11 Jan 2007 07:35:59 +0000 (07:35 -0000)
package/cairo/cairo.mk patch | blob | history

diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 85b20d97d71db77dfcf78d017adf356b32213295..ba46917eed426ddddb3a20fcf603cb8323723079 100644 (file)
--- 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)