From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15051 invoked by alias); 14 Apr 2008 19:48:07 -0000 Received: (qmail 15033 invoked by uid 22791); 14 Apr 2008 19:48:04 -0000 X-Spam-Check-By: sourceware.org Received: from NaN.false.org (HELO nan.false.org) (208.75.86.248) by sourceware.org (qpsmtpd/0.31) with ESMTP; Mon, 14 Apr 2008 19:47:37 +0000 Received: from nan.false.org (localhost [127.0.0.1]) by nan.false.org (Postfix) with ESMTP id 4DEFE983DA; Mon, 14 Apr 2008 19:47:36 +0000 (GMT) Received: from caradoc.them.org (22.svnf5.xdsl.nauticom.net [209.195.183.55]) by nan.false.org (Postfix) with ESMTP id 30C6B98119; Mon, 14 Apr 2008 19:47:36 +0000 (GMT) Received: from drow by caradoc.them.org with local (Exim 4.69) (envelope-from ) id 1JlUeN-0002as-Dv; Mon, 14 Apr 2008 15:47:35 -0400 Date: Mon, 14 Apr 2008 20:00:00 -0000 From: Daniel Jacobowitz To: Aleksandar Ristovski Cc: Doug Evans , gdb-patches@sourceware.org Subject: Re: [RFA] lmemmem.patch Message-ID: <20080414194735.GQ1968@caradoc.them.org> Mail-Followup-To: Aleksandar Ristovski , Doug Evans , gdb-patches@sourceware.org References: <4803ACCB.3040102@qnx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4803ACCB.3040102@qnx.com> User-Agent: Mutt/1.5.17 (2007-12-11) X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2008-04/txt/msg00265.txt.bz2 On Mon, Apr 14, 2008 at 03:13:15PM -0400, Aleksandar Ristovski wrote: > In file included from ../../src/gdb/gdb_string.h:25, > from ../../src/gdb/tui/tui-main.c:22: > gnulib/string.h:78:5: error: #if with no expression > gnulib/string.h:98:5: error: #if with no expression > ... Boo, I forgot to run autoheader. And I botched running automake by not rerunning it after aclocal. And the dependencies are wrong. Checked in the attached. Please tell me this works better... -- Daniel Jacobowitz CodeSourcery 2008-04-14 Daniel Jacobowitz * Makefile.in (GNULIB_H): New. Trigger all-lib. (defs_h): Use $(GNULIB_H). (all-lib): Depend on gnulib/Makefile. (gnulib/Makefile): Regenerate gnulib/Makefile and gnulib/.deps. * config.in, gnulib/Makefile.in: Regenerated. Index: Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/Makefile.in,v retrieving revision 1.999 diff -u -p -r1.999 Makefile.in --- Makefile.in 14 Apr 2008 18:04:00 -0000 1.999 +++ Makefile.in 14 Apr 2008 19:46:21 -0000 @@ -164,6 +164,10 @@ TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYST LIBGNU = gnulib/libgnu.a INCGNU = -I$(srcdir)/gnulib -Ignulib +# Generated headers in the gnulib directory. These must be listed +# so that they are generated before other files are compiled. +GNULIB_H = gnulib/string.h + # # CLI sub directory definitons # @@ -754,9 +758,10 @@ completer_h = completer.h cp_abi_h = cp-abi.h cp_support_h = cp-support.h $(symtab_h) dcache_h = dcache.h +# Depend on $(GNULIB_H), since generated files are created in the gnulib build. defs_h = defs.h $(config_h) $(ansidecl_h) $(gdb_locale_h) $(gdb_signals_h) \ $(libiberty_h) $(bfd_h) $(ui_file_h) $(nm_h) \ - $(fopen_bin_h) $(gdbarch_h) + $(fopen_bin_h) $(gdbarch_h) $(GNULIB_H) dictionary_h = dictionary.h disasm_h = disasm.h doublest_h = doublest.h $(floatformat_h) @@ -1335,8 +1340,8 @@ $(TUI)$(EXEEXT): tui-main.o libgdb.a $(A $(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES) # Convenience rule to handle recursion. -$(LIBGNU): all-lib -all-lib: +$(LIBGNU) $(GNULIB_H): all-lib +all-lib: gnulib/Makefile @$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=gnulib subdir_do .PHONY: all-lib @@ -1442,11 +1447,18 @@ subdir_do: force Makefile: Makefile.in config.status @frags@ # Regenerate the Makefile and the tm.h / nm.h links. - CONFIG_FILES=Makefile \ + CONFIG_FILES="Makefile" \ CONFIG_COMMANDS= \ CONFIG_HEADERS= \ $(SHELL) config.status +gnulib/Makefile: gnulib/Makefile.in gnulib/Makefile.in config.status @frags@ + CONFIG_FILES="gnulib/Makefile" \ + CONFIG_COMMANDS="depfiles" \ + CONFIG_HEADERS= \ + CONFIG_LINKS= \ + $(SHELL) config.status + config.h: stamp-h ; @true stamp-h: config.in config.status CONFIG_HEADERS=config.h:config.in \