From cede19f7c5a151c1aeb7c93d1793183bca8e8289 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Sat, 7 May 2011 13:50:10 +0300 Subject: Minor change in makefiles. * src/Makefile.am: Remove. * src/Make.am (GRECS_SRC): Remove grecs.h * src/Make-inst.am (include_HEADERS): Add grecs.h * src/Make-shared.am (noinst_HEADERS): Add grecs.h * src/Make-static.am: Likewise. --- src/Make-inst.am | 1 + src/Make-shared.am | 1 + src/Make-static.am | 1 + src/Make.am | 1 - src/Makefile.am | 43 ------------------------------------------- 5 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 src/Makefile.am (limited to 'src') diff --git a/src/Make-inst.am b/src/Make-inst.am index 3b394b0..d895a7e 100644 --- a/src/Make-inst.am +++ b/src/Make-inst.am @@ -17,3 +17,4 @@ include Make.am lib_LTLIBRARIES=libgrecs.la libgrecs_la_SOURCES = $(GRECS_SRC) +include_HEADERS = grecs.h diff --git a/src/Make-shared.am b/src/Make-shared.am index bbf25d4..fb6f806 100644 --- a/src/Make-shared.am +++ b/src/Make-shared.am @@ -16,3 +16,4 @@ include Make.am noinst_LT_LIBRARIES=libgrecs.la libgrecs_la_SOURCES = $(GRECS_SRC) +noinst_HEADERS = grecs.h diff --git a/src/Make-static.am b/src/Make-static.am index bf4f7ce..6029f2d 100644 --- a/src/Make-static.am +++ b/src/Make-static.am @@ -16,3 +16,4 @@ include Make.am noinst_LIBRARIES=libgrecs.a libgrecs_a_SOURCES = $(GRECS_SRC) +noinst_HEADERS = grecs.h diff --git a/src/Make.am b/src/Make.am index 27f8010..f246099 100644 --- a/src/Make.am +++ b/src/Make.am @@ -28,7 +28,6 @@ GRECS_SRC = \ symtab.c\ text.c\ tree.c\ - grecs.h\ version.c\ wordsplit.c\ wordsplit.h diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 76ae21a..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -# This file is part of grecs - Gray's Extensible Configuration System -# Copyright (C) 2007, 2009-2011 Sergey Poznyakoff -# -# Grecs is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# Grecs is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Grecs. If not, see . - -noinst_LIBRARIES=libgrecs.a -libgrecs_a_SOURCES = \ - diag.c\ - format.c\ - grecs-gram.y\ - grecs-lex.l\ - list.c\ - lookup.c\ - mem.c\ - preproc.c\ - symtab.c\ - text.c\ - tree.c\ - grecs.h\ - wordsplit.c\ - wordsplit.h - -EXTRA_DIST=grecs-gram.h $(PP_SETUP_FILE) - -INCLUDES = -I$(srcdir) @GRECS_INCLUDES@ -AM_YFLAGS = -dtv -AM_LFLAGS = -d -# Use a modified ylwrap implementation that understands the --prefix option. -YLWRAP = $(top_srcdir)/$(grex_topdir)grecs/build-aux/ylwrap --prefix yy_grecs - -incdir=$(pkgdatadir)/$(VERSION)/include -inc_DATA = $(PP_SETUP_FILE) -- cgit v1.2.1