Commit d75145f3 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

* Contribs: Remove unneeded files

* Contribs: change gz => bz2 for autoconf package
parent dd91fd88
......@@ -178,7 +178,8 @@ else
.live .goom2k4 .caca .mod .x264 .xml .twolame \
.png .gpg-error .gcrypt .gnutls .mpcdec \
.dvdnav .dvbpsi .wxwidgets .qt4 .dirac \
.dx_headers .dshow_headers .aclocal .gecko-win32 .unicows .libdca
.dx_headers .dshow_headers .aclocal .gecko-win32 .unicows .libdca \
.SDL_image
# .SDL_image .daap .cddb .cdio .vcdimager .portaudio
else
......@@ -310,11 +311,11 @@ endif
# autoconf
# ***************************************************************************
autoconf-$(AUTOCONF_VERSION).tar.gz:
autoconf-$(AUTOCONF_VERSION).tar.bz2:
$(WGET) $(AUTOCONF_URL)
autoconf: autoconf-$(AUTOCONF_VERSION).tar.gz
$(EXTRACT_GZ)
autoconf: autoconf-$(AUTOCONF_VERSION).tar.bz2
$(EXTRACT_BZ2)
.autoconf: autoconf
(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
......@@ -322,7 +323,7 @@ autoconf: autoconf-$(AUTOCONF_VERSION).tar.gz
CLEAN_FILE += .autoconf
CLEAN_PKG += autoconf
DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.gz
DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.bz2
# ***************************************************************************
# libtool
......
diff -Naur tiff/libtiff/Makefile.in tiff-new/libtiff/Makefile.in
--- tiff/libtiff/Makefile.in 1996-04-30 00:16:21.000000000 +0200
+++ tiff-new/libtiff/Makefile.in 2005-08-31 20:06:07.000000000 +0200
@@ -206,9 +206,9 @@
ALPHA = @ALPHAFILE@
VERSION = @VERSIONFILE@
-
+# Gruick hard code gcc if we crosscompile
version.h: ${VERSION} ${ALPHA} ${SRCDIR}/mkversion.c
- ${CC} -o mkversion ${CFLAGS} ${SRCDIR}/mkversion.c
+ gcc -o mkversion ${CFLAGS} ${SRCDIR}/mkversion.c
rm -f version.h; ./mkversion -v ${VERSION} -a ${ALPHA} version.h
tif_version.o: version.h
@@ -217,8 +217,10 @@
# are generated by the mkg3states program. On systems without
# make these rules have to be manually carried out.
#
+#Gruikk. hard code gcc when we cross-compile
+#
tif_fax3sm.c: ${SRCDIR}/mkg3states.c ${SRCDIR}/tif_fax3.h
- ${CC} -o mkg3states ${CFLAGS} ${SRCDIR}/mkg3states.c
+ gcc -o mkg3states ${CFLAGS} ${SRCDIR}/mkg3states.c
rm -f tif_fax3sm.c; ./mkg3states -c const tif_fax3sm.c
tif_aux.o: ${SRCDIR}/tif_aux.c
This diff is collapsed.
......@@ -31,7 +31,7 @@ PERL_URL=http://ftp.funet.fi/pub/CPAN/src/perl-$(PERL_VERSION).tar.gz
# Autoconf > 2.57 doesn't work ok on BeOS. Don't ask why.
# we have to use a newer though, because bootstrap won't work otherwise
AUTOCONF_VERSION=2.60
AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.gz
AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.bz2
LIBTOOL_VERSION=1.5.6
LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
AUTOMAKE_VERSION=1.9.6
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment