aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Mike Frysinger <vapier@gentoo.org>2004-10-09 20:18:02 +0000
committerGravatar Mike Frysinger <vapier@gentoo.org>2004-10-09 20:18:02 +0000
commitb0842f9a139203fb5a2e36863ac9553f3b9c1e5d (patch)
tree7e5f3e4ff9b7bdb970903ef5ab8a8b98590db3fa /package
parent612ce732f21260c1b7ac63ee26183d2c77fd5426 (diff)
downloadbuildroot-b0842f9a139203fb5a2e36863ac9553f3b9c1e5d.tar.gz
buildroot-b0842f9a139203fb5a2e36863ac9553f3b9c1e5d.tar.bz2
Thomas Lundquist: have the makefiles depend on the correct file
Diffstat (limited to 'package')
-rw-r--r--package/libmad/libmad.mk18
-rw-r--r--package/lzo/lzo.mk5
2 files changed, 10 insertions, 13 deletions
diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index 36e3e9ccaa..aaedb41d2e 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -4,21 +4,18 @@
#
#############################################################
-LIBMAD_VERSION=0.15.0b
-
-# Don't alter below this line unless you (think) you know
-# what you are doing! Danger, Danger!
-
+LIBMAD_VERSION=0.15.1b
LIBMAD_SOURCE=libmad-$(LIBMAD_VERSION).tar.gz
LIBMAD_SITE=http://easynews.dl.sourceforge.net/sourceforge/mad/
LIBMAD_DIR=$(BUILD_DIR)/${shell basename $(LIBMAD_SOURCE) .tar.gz}
LIBMAD_WORKDIR=$(BUILD_DIR)/libmad-$(LIBMAD_VERSION)
+LIBMAD_CAT:=zcat
$(DL_DIR)/$(LIBMAD_SOURCE):
$(WGET) -P $(DL_DIR) $(LIBMAD_SITE)/$(LIBMAD_SOURCE)
-$(LIBMAD_DIR)/.unpacked: $(DL_DIR)/$(LIBMAD_SOURCE)
- gzip -d -c $(DL_DIR)/$(LIBMAD_SOURCE) | tar -C $(BUILD_DIR) -x$(TAR_VERBOSITY)f -
+$(LIBMAD_DIR)/.unpacked: $(DL_DIR)/$(LIBMAD_SOURCE)
+ $(LIBMAD_CAT) $(DL_DIR)/$(LIBMAD_SOURCE) | tar -C $(BUILD_DIR) -x$(TAR_VERBOSITY)f -
touch $(LIBMAD_DIR)/.unpacked
$(LIBMAD_DIR)/.configured: $(LIBMAD_DIR)/.unpacked
@@ -32,13 +29,13 @@ $(LIBMAD_DIR)/.configured: $(LIBMAD_DIR)/.unpacked
--sysconfdir=/etc \
$(DISABLE_NLS) \
);
- touch $(LIBMAD_DIR)/.configured
+ touch $(LIBMAD_DIR)/.configured
-$(LIBMAD_WORKDIR)/libmad: $(LIBMAD_DIR)/.configured
+$(LIBMAD_WORKDIR)/libmad.la: $(LIBMAD_DIR)/.configured
rm -f $@
$(MAKE) CC=$(TARGET_CC) -C $(LIBMAD_WORKDIR)
-$(LIBMAD_WORKDIR)/.installed: $(LIBMAD_WORKDIR)/libmad
+$(LIBMAD_WORKDIR)/.installed: $(LIBMAD_WORKDIR)/libmad.la
$(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBMAD_WORKDIR) install
touch $(LIBMAD_WORKDIR)/.installed
@@ -53,4 +50,3 @@ libmad-clean:
libmad-dirclean:
rm -rf $(LIBMAD_DIR) $(LIBMAD_WORKDIR)
-
diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk
index c1b711f42a..94ce575349 100644
--- a/package/lzo/lzo.mk
+++ b/package/lzo/lzo.mk
@@ -29,6 +29,7 @@ LZO_CONFIG_SHARED:=--disable-shared
$(LZO_DIR)/.configured: $(LZO_DIR)/.unpacked
(cd $(LZO_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
@@ -50,10 +51,10 @@ $(LZO_DIR)/.configured: $(LZO_DIR)/.unpacked
$(LZO_DIR)/src/liblzo.la: $(LZO_DIR)/.configured
$(MAKE) -C $(LZO_DIR)
-$(STAGING_DIR)/lib/liblzo.a: $(LZO_DIR)/src/liblzo.la
+$(STAGING_DIR)/usr/lib/liblzo.a: $(LZO_DIR)/src/liblzo.la
$(MAKE) CC=$(TARGET_CC) DESTDIR=$(STAGING_DIR) -C $(LZO_DIR) install
-lzo: uclibc $(STAGING_DIR)/lib/liblzo.a
+lzo: uclibc $(STAGING_DIR)/usr/lib/liblzo.a
lzo-clean:
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LZO_DIR) uninstall