Thomas Lundquist: have the makefiles depend on the correct file

This commit is contained in:
Mike Frysinger 2004-10-09 20:18:02 +00:00
parent 612ce732f2
commit b0842f9a13
2 changed files with 10 additions and 13 deletions

View File

@ -4,21 +4,18 @@
# #
############################################################# #############################################################
LIBMAD_VERSION=0.15.0b LIBMAD_VERSION=0.15.1b
# Don't alter below this line unless you (think) you know
# what you are doing! Danger, Danger!
LIBMAD_SOURCE=libmad-$(LIBMAD_VERSION).tar.gz LIBMAD_SOURCE=libmad-$(LIBMAD_VERSION).tar.gz
LIBMAD_SITE=http://easynews.dl.sourceforge.net/sourceforge/mad/ LIBMAD_SITE=http://easynews.dl.sourceforge.net/sourceforge/mad/
LIBMAD_DIR=$(BUILD_DIR)/${shell basename $(LIBMAD_SOURCE) .tar.gz} LIBMAD_DIR=$(BUILD_DIR)/${shell basename $(LIBMAD_SOURCE) .tar.gz}
LIBMAD_WORKDIR=$(BUILD_DIR)/libmad-$(LIBMAD_VERSION) LIBMAD_WORKDIR=$(BUILD_DIR)/libmad-$(LIBMAD_VERSION)
LIBMAD_CAT:=zcat
$(DL_DIR)/$(LIBMAD_SOURCE): $(DL_DIR)/$(LIBMAD_SOURCE):
$(WGET) -P $(DL_DIR) $(LIBMAD_SITE)/$(LIBMAD_SOURCE) $(WGET) -P $(DL_DIR) $(LIBMAD_SITE)/$(LIBMAD_SOURCE)
$(LIBMAD_DIR)/.unpacked: $(DL_DIR)/$(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_CAT) $(DL_DIR)/$(LIBMAD_SOURCE) | tar -C $(BUILD_DIR) -x$(TAR_VERBOSITY)f -
touch $(LIBMAD_DIR)/.unpacked touch $(LIBMAD_DIR)/.unpacked
$(LIBMAD_DIR)/.configured: $(LIBMAD_DIR)/.unpacked $(LIBMAD_DIR)/.configured: $(LIBMAD_DIR)/.unpacked
@ -32,13 +29,13 @@ $(LIBMAD_DIR)/.configured: $(LIBMAD_DIR)/.unpacked
--sysconfdir=/etc \ --sysconfdir=/etc \
$(DISABLE_NLS) \ $(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 $@ rm -f $@
$(MAKE) CC=$(TARGET_CC) -C $(LIBMAD_WORKDIR) $(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 $(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBMAD_WORKDIR) install
touch $(LIBMAD_WORKDIR)/.installed touch $(LIBMAD_WORKDIR)/.installed
@ -53,4 +50,3 @@ libmad-clean:
libmad-dirclean: libmad-dirclean:
rm -rf $(LIBMAD_DIR) $(LIBMAD_WORKDIR) rm -rf $(LIBMAD_DIR) $(LIBMAD_WORKDIR)

View File

@ -29,6 +29,7 @@ LZO_CONFIG_SHARED:=--disable-shared
$(LZO_DIR)/.configured: $(LZO_DIR)/.unpacked $(LZO_DIR)/.configured: $(LZO_DIR)/.unpacked
(cd $(LZO_DIR); rm -rf config.cache; \ (cd $(LZO_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
./configure \ ./configure \
--target=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \
--host=$(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 $(LZO_DIR)/src/liblzo.la: $(LZO_DIR)/.configured
$(MAKE) -C $(LZO_DIR) $(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 $(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: lzo-clean:
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LZO_DIR) uninstall $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LZO_DIR) uninstall