From cd409e3b50c48def3561ac56366d6b45e6d0f6ce Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 23 Sep 2008 15:00:06 +0200 Subject: [PATCH] Remove examples/local.mk. examples/calc++/Makefile.am might be interesting to keep as is, since it is an example in itself. * examples/Makefile.am: Rename as... * examples/local.mk: this. Adjust. * Makefile.am, configure.ac: Adjust. --- ChangeLog | 11 +++++++++++ Makefile.am | 6 +++++- configure.ac | 3 +-- examples/{Makefile.am => local.mk} | 9 ++------- 4 files changed, 19 insertions(+), 10 deletions(-) rename examples/{Makefile.am => local.mk} (76%) diff --git a/ChangeLog b/ChangeLog index bbdeb2d6..707aad9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-11-15 Akim Demaille + + Remove examples/local.mk. + examples/calc++/Makefile.am might be interesting to keep as is, since + it is an example in itself. + + * examples/Makefile.am: Rename as... + * examples/local.mk: this. + Adjust. + * Makefile.am, configure.ac: Adjust. + 2008-11-15 Akim Demaille Remove build-aux/Makefile.am. diff --git a/Makefile.am b/Makefile.am index 90bef28a..3362bd6f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,10 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = po runtime-po lib data src doc examples tests etc +SUBDIRS = po runtime-po lib data src doc tests etc +if BISON_CXX_WORKS +SUBDIRS += examples/calc++ +endif # Files installed for use by Automake. aclocaldir = @aclocaldir@ @@ -31,6 +34,7 @@ EXTRA_DIST = .prev-version .version cfg.mk maint.mk \ djgpp/fnchange.lst djgpp/testsuite.sed include build-aux/local.mk +include examples/local.mk .PHONY: maintainer-check maintainer-check: diff --git a/configure.ac b/configure.ac index 496f6e83..51e0553f 100644 --- a/configure.ac +++ b/configure.ac @@ -152,8 +152,7 @@ AC_CONFIG_FILES([Makefile po/Makefile.in data/Makefile etc/Makefile - examples/Makefile - examples/calc++/Makefile + examples/calc++/Makefile lib/Makefile src/Makefile doc/Makefile doc/yacc.1]) diff --git a/examples/Makefile.am b/examples/local.mk similarity index 76% rename from examples/Makefile.am rename to examples/local.mk index 4f2176fc..0718b67a 100644 --- a/examples/Makefile.am +++ b/examples/local.mk @@ -1,5 +1,4 @@ -## Process this file with automake to produce Makefile.in -*-Makefile-*- -## Copyright (C) 2005 Free Software Foundation, Inc. +## Copyright (C) 2005, 2008 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -14,8 +13,4 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if BISON_CXX_WORKS -SUBDIRS = calc++ -endif - -dist_noinst_SCRIPTS = extexi +dist_noinst_SCRIPTS = examples/extexi -- 2.45.2