Remove src/Makefile.am.

* src/Makefile.am: Rename as...
	* src/local.mk: this.
	Prefix all the paths with src/.
	(AUTOMAKE_OPTIONS): Build object files in the sub dirs.
	(AM_CPPFLAGS): Find find in builddir/src.
	(YACC): Move the flags into...
	(AM_YFLAGS): here.
	* maint.mk (sc_tight_scope): Disable.
	It used to bounce to the version in src/Makefile.am which is now
	part of this very Makefile.
	* Makefile.am, configure.ac: Adjust.
	* src/scan-code-c.c, src/scan-code.l: We can no longer rely on
	include "..." to find files "here": we are no longer in src/, so
	qualify the includes with src/.
	* doc/Makefile.am (PREPATH): No longer include the top_builddir
	prefix.
	(.x.1): Adjust to be able to create src/foo from the top level
	Makefile, instead of going bounce to src/Makefile the creation of
	foo.
This commit is contained in:
Akim Demaille
2008-09-23 15:54:56 +02:00
parent 5277c0a304
commit 0305d25eb0
13 changed files with 229 additions and 162 deletions

View File

@@ -1,6 +1,6 @@
/* Scan Bison Skeletons. -*- C -*-
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -28,16 +28,16 @@
#define skel_wrap() 1
#define FLEX_PREFIX(Id) skel_ ## Id
#include "flex-scanner.h"
#include <src/flex-scanner.h>
#include <dirname.h>
#include <error.h>
#include <quotearg.h>
#include "complain.h"
#include "getargs.h"
#include "files.h"
#include "scan-skel.h"
#include <src/complain.h>
#include <src/getargs.h>
#include <src/files.h>
#include <src/scan-skel.h>
#define YY_DECL static int skel_lex (void)
YY_DECL;