From: Holger S. <h.s...@mn...> - 2002-08-16 10:28:33
|
The following patch disables all warnings of automake1.5: Is it ok to submit this? (not sure if it would break old automake) Index: configure.in =================================================================== RCS file: /cvsroot/blob/blob/configure.in,v retrieving revision 1.54 diff -u -b -B -w -p -r1.54 configure.in --- configure.in 14 Aug 2002 20:48:09 -0000 1.54 +++ configure.in 16 Aug 2002 10:20:16 -0000 @@ -46,7 +46,10 @@ AC_CHECK_PROGS(CC, arm-linux-gcc gcc, ec AC_CHECK_PROGS(OBJCOPY, arm-linux-objcopy objcopy, echo) AC_CHECK_PROGS(RANLIB, arm-linux-ranlib ranlib, echo) AC_CHECK_PROGS(AR, arm-linux-ar ar, echo) - +# Shuts up warnings of automake1.5 (and we use gcc as assembler) +AC_CHECK_PROGS(AS, arm-linux-gcc gcc, echo) +# Shuts up warnings of automake1.5 +AC_SUBST(ASFLAGS) Index: src/blob/Makefile.am =================================================================== RCS file: /cvsroot/blob/blob/src/blob/Makefile.am,v retrieving revision 1.32 diff -u -b -B -w -p -r1.32 Makefile.am --- src/blob/Makefile.am 14 Aug 2002 21:04:23 -0000 1.32 +++ src/blob/Makefile.am 16 Aug 2002 10:20:16 -0000 @@ -32,7 +32,7 @@ bin_PROGRAMS = \ blob-chain -INCLUDES += \ +INCLUDES = \ -I${top_builddir}/include \ -I${top_srcdir}/include @@ -72,11 +72,11 @@ blob_start_elf32_DEPENDENCIES = \ @BLOB_STARTCODE_OBJS@ \ start-ld-script -blob_start_elf32_LDFLAGS += \ +blob_start_elf32_LDFLAGS = \ -Wl,-T,${srcdir}/start-ld-script \ -Wl,-Map,blob-start-elf32.map -blob_start_elf32_LDADD += \ +blob_start_elf32_LDADD = \ @BLOB_MEMSETUP_OBJS@ \ @BLOB_STARTCODE_OBJS@ \ -lgcc @@ -85,7 +85,7 @@ blob_start_elf32_LDADD += \ blob_start_SOURCES = -blob-start: blob-start-elf32 +blob-start$(EXEEXT): blob-start-elf32 $(OBJCOPY) $(OCFLAGS) $< $@ @@ -102,18 +102,18 @@ blob_start_chain_elf32_SOURCES = \ blob_start_chain_elf32_DEPENDENCIES =\ start-ld-script -blob_start_chain_elf32_LDFLAGS += \ +blob_start_chain_elf32_LDFLAGS = \ -Wl,-T,${srcdir}/start-ld-script \ -Wl,-Map,blob-start-chain-elf32.map -blob_start_chain_elf32_LDADD += \ +blob_start_chain_elf32_LDADD = \ -lgcc blob_start_chain_SOURCES = -blob-start-chain: blob-start-chain-elf32 +blob-start-chain$(EXEEXT): blob-start-chain-elf32 $(OBJCOPY) $(OCFLAGS) $< $@ @@ -171,12 +171,12 @@ blob_rest_elf32_DEPENDENCIES = \ rest-ld-script -blob_rest_elf32_LDFLAGS += \ +blob_rest_elf32_LDFLAGS = \ -Wl,-T,rest-ld-script \ -Wl,-Map,blob-rest-elf32.map -blob_rest_elf32_LDADD += \ +blob_rest_elf32_LDADD = \ @BLOB_CHKMEM_OBJS@ \ @BLOB_CLOCK_OBJS@ \ @BLOB_CRAMFS_OBJS@ \ @@ -193,7 +193,7 @@ blob_rest_elf32_LDADD += \ blob_rest_SOURCES = -blob-rest: blob-rest-elf32 +blob-rest$(EXEXT): blob-rest-elf32 $(OBJCOPY) $(OCFLAGS) $< $@ @@ -204,7 +204,7 @@ blob-rest: blob-rest-elf32 blob_SOURCES = -blob: blob-start blob-rest +blob$(EXEEXT): blob-start blob-rest rm -f $@ dd if=blob-start of=$@ bs=1k conv=sync dd if=blob-rest of=$@ bs=1k seek=1 @@ -217,7 +217,7 @@ blob: blob-start blob-rest blob_chain_SOURCES = -blob-chain: blob-start-chain blob-rest +blob-chain$(EXEXT): blob-start-chain blob-rest rm -f $@ dd if=blob-start-chain of=$@ bs=1k conv=sync dd if=blob-rest of=$@ bs=1k seek=1 Index: src/commands/Makefile.am =================================================================== RCS file: /cvsroot/blob/blob/src/commands/Makefile.am,v retrieving revision 1.5 diff -u -b -B -w -p -r1.5 Makefile.am --- src/commands/Makefile.am 17 Apr 2002 19:39:50 -0000 1.5 +++ src/commands/Makefile.am 16 Aug 2002 10:20:16 -0000 @@ -41,7 +41,7 @@ libcommands_a_SOURCES = \ terminal.c -INCLUDES += \ +INCLUDES = \ -I${top_builddir}/include \ -I${top_srcdir}/include Index: src/diag/Makefile.am =================================================================== RCS file: /cvsroot/blob/blob/src/diag/Makefile.am,v retrieving revision 1.17 diff -u -b -B -w -p -r1.17 Makefile.am --- src/diag/Makefile.am 14 Aug 2002 21:06:24 -0000 1.17 +++ src/diag/Makefile.am 16 Aug 2002 10:20:16 -0000 @@ -27,7 +27,7 @@ bin_PROGRAMS = \ diag -INCLUDES += \ +INCLUDES = \ -I${top_builddir}/include \ -I${top_srcdir}/include @@ -82,12 +82,12 @@ diag_elf32_DEPENDENCIES = \ ${top_builddir}/src/lib/libblob.a \ ld-script -diag_elf32_LDFLAGS += \ +diag_elf32_LDFLAGS = \ -Wl,-T,${srcdir}/ld-script \ -Wl,-Map,diag-elf32.map -diag_elf32_LDADD += \ +diag_elf32_LDADD = \ @DIAG_LCD_OBJS@ \ @DIAG_PLATFORM_OBJS@ \ -L${top_builddir}/src/commands -L${top_builddir}/src/lib \ @@ -98,7 +98,7 @@ diag_elf32_LDADD += \ diag_SOURCES = -diag: diag-elf32 +diag$(EXEEXT): diag-elf32 $(OBJCOPY) $(OCFLAGS) $< $@ Index: src/lib/Makefile.am =================================================================== RCS file: /cvsroot/blob/blob/src/lib/Makefile.am,v retrieving revision 1.22 diff -u -b -B -w -p -r1.22 Makefile.am --- src/lib/Makefile.am 14 Aug 2002 21:13:45 -0000 1.22 +++ src/lib/Makefile.am 16 Aug 2002 10:20:16 -0000 @@ -56,7 +56,7 @@ libblob_a_DEPENDENCIES = \ libblob_a_LIBADD = \ @BLOB_SERIAL_DRIVER_OBJS@ -INCLUDES += \ +INCLUDES = \ -I${top_builddir}/include \ -I${top_srcdir}/include |