From b99e8e9a466cedae61a2d208ce993836e68701aa Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 20 Oct 2014 01:22:07 +0100 Subject: [PATCH] Build system: Break out common.make[.in] Signed-off-by: Ian Jackson --- .gitignore | 1 + Makefile.in | 4 ++- common.make.in | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ configure | 3 ++- configure.in | 2 +- settings.make.in | 40 +----------------------------- 6 files changed, 71 insertions(+), 42 deletions(-) create mode 100644 common.make.in diff --git a/.gitignore b/.gitignore index e85580f..05e7a36 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ config.status autom4te.cache dist_tmp adns-*.tar.gz +common.make settings.make *.tmp* *.o diff --git a/Makefile.in b/Makefile.in index 4faa50b..2acc8f3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,8 +20,10 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation. +include ./common.make + # Remember to change ADNS_VERSION_STRING in client/client.h too, and -# possibly library soname (MAJOR and MINOR in settings.make.in). +# possibly library soname (MAJOR and MINOR in common.make.in). DISTVERSION= 1.5.0~~ srcdir= @srcdir@ diff --git a/common.make.in b/common.make.in new file mode 100644 index 0000000..09ca9dc --- /dev/null +++ b/common.make.in @@ -0,0 +1,63 @@ +# common.make[.in] - common configuration settings for Makefiles, +# used by autoconf/configure to generate settings.make +# +# This file is part of adns, which is +# Copyright (C) 1997-2000,2003,2006,2014 Ian Jackson +# Copyright (C) 2014 Mark Wooding +# Copyright (C) 1999-2000,2003,2006 Tony Finch +# Copyright (C) 1991 Massachusetts Institute of Technology +# (See the file INSTALL for full details.) +# +# 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 +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# This program 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 this program; if not, write to the Free Software Foundation. + +MAJOR= 1 +MINOR= 3 +SHLIBFILE= @SHLIBFILE@ +SHLIBSONAME= @SHLIBSONAME@ +SHLIBFORLINK= @SHLIBFORLINK@ + +CC= @CC@ +CFLAGS= $(AUTOCFLAGS) $(WARNS) $(WERROR) $(DIRCFLAGS) $(XCFLAGS) +LDFLAGS= $(AUTOLDFLAGS) $(DIRLDFLAGS) $(XLDFLAGS) +LDLIBS= @LIBS@ $(XLIBS) +AUTOCFLAGS= @CFLAGS@ +AUTOLDFLAGS= @LDFLAGS@ +WARNS= @WARNS@ +#WERROR= -Werror + +M4= m4 +RANLIB= @RANLIB@ + +SHLIBCC= @SHLIBCC@ + +MKSHLIB_1= @MKSHLIB_1@ +MKSHLIB_2= @MKSHLIB_2@ +MKSHLIB_3= @MKSHLIB_3@ + +prefix= @prefix@ +exec_prefix= @exec_prefix@ +bindir= @bindir@ +libdir= @libdir@ +includedir= @includedir@ + +AC_INSTALL= @INSTALL@ +ifeq ($(AC_INSTALL),./install-sh -c) +INSTALL= $(srcdir)/../$(AC_INSTALL) +else +INSTALL= $(AC_INSTALL) +endif + +INSTALL_PROGRAM= $(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS) +INSTALL_DATA= $(INSTALL) -m 644 + diff --git a/configure b/configure index e051665..825233c 100755 --- a/configure +++ b/configure @@ -4054,7 +4054,7 @@ MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -o' MKSHLIB_2='' MKSHLIB_3='-lc' -ac_config_files="$ac_config_files settings.make Makefile src/Makefile client/Makefile dynamic/Makefile regress/Makefile" +ac_config_files="$ac_config_files common.make settings.make Makefile src/Makefile client/Makefile dynamic/Makefile regress/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -4747,6 +4747,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;; + "common.make") CONFIG_FILES="$CONFIG_FILES common.make" ;; "settings.make") CONFIG_FILES="$CONFIG_FILES settings.make" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; diff --git a/configure.in b/configure.in index 2855fe6..2221d08 100644 --- a/configure.in +++ b/configure.in @@ -148,6 +148,6 @@ MKSHLIB_2='' MKSHLIB_3='-lc' AC_OUTPUT( - settings.make Makefile + common.make settings.make Makefile src/Makefile client/Makefile dynamic/Makefile regress/Makefile ) diff --git a/settings.make.in b/settings.make.in index abab1fd..81e1bb3 100644 --- a/settings.make.in +++ b/settings.make.in @@ -21,45 +21,7 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation. -MAJOR= 1 -MINOR= 3 -SHLIBFILE= @SHLIBFILE@ -SHLIBSONAME= @SHLIBSONAME@ -SHLIBFORLINK= @SHLIBFORLINK@ - -CC= @CC@ -CFLAGS= $(AUTOCFLAGS) $(WARNS) $(WERROR) $(DIRCFLAGS) $(XCFLAGS) -LDFLAGS= $(AUTOLDFLAGS) $(DIRLDFLAGS) $(XLDFLAGS) -LDLIBS= @LIBS@ $(XLIBS) -AUTOCFLAGS= @CFLAGS@ -AUTOLDFLAGS= @LDFLAGS@ -WARNS= @WARNS@ -#WERROR= -Werror - -M4= m4 -RANLIB= @RANLIB@ - -SHLIBCC= @SHLIBCC@ - -MKSHLIB_1= @MKSHLIB_1@ -MKSHLIB_2= @MKSHLIB_2@ -MKSHLIB_3= @MKSHLIB_3@ - -prefix= @prefix@ -exec_prefix= @exec_prefix@ -bindir= @bindir@ -libdir= @libdir@ -includedir= @includedir@ - -AC_INSTALL= @INSTALL@ -ifeq ($(AC_INSTALL),./install-sh -c) -INSTALL= $(srcdir)/../$(AC_INSTALL) -else -INSTALL= $(AC_INSTALL) -endif - -INSTALL_PROGRAM= $(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS) -INSTALL_DATA= $(INSTALL) -m 644 +include ../common.make all: $(TARGETS) -- 2.30.2