[Swan-dev] missing bison masked by new Makefiles?
Andrew Cagney
andrew.cagney at gmail.com
Mon Feb 23 21:28:38 EET 2015
How about the attached? While very tentative, and pulled from a local
branch, it does give an idea for where things are going.
On 17 February 2015 at 15:25, D. Hugh Redelmeier <hugh at mimosa.com> wrote:
> | From: Andrew Cagney <andrew.cagney at gmail.com>
>
> | The only thing explicitly dependent on parser.tab.c is Makefile.depend
> | and that rule is allowed to fail - long standing problem.
>
> One possibly-related thing that has been a long time problem:
>
> Under some conditions, a build will drop
> lib/libipsecconf/lex.yy.c
> lib/libipsecconf/parser.dot
> lib/libipsecconf/parser.output
> lib/libipsecconf/parser.tab.c
> lib/libipsecconf/parser.tab.h
> in the source tree.
>
> Please make it stop.
> _______________________________________________
> Swan-dev mailing list
> Swan-dev at lists.libreswan.org
> https://lists.libreswan.org/mailman/listinfo/swan-dev
-------------- next part --------------
commit 57d96dda8dc1efd654f60b7973270990d9e721b6
Author: Andrew Cagney <cagney at gnu.org>
Date: Mon Feb 23 13:46:31 2015 -0500
buiding: copy Makefile.inc+Makefile.ver to mk/config.mk and mk/version.mk
As before have old files include new for now.
diff --git a/Makefile.inc b/Makefile.inc
index 2ec84db..fd7f206 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,509 +1,2 @@
-# Libreswan pathnames and other master configuration
-#
-# Copyright (C) 2001, 2002 Henry Spencer.
-# Copyright (C) 2003-2006 Xelerance Corporation
-# Copyright (C) 2012 Paul Wouters <paul at libreswan.org>
-# Copyright (C) 2015 Andrew Cagney <cagney at gnu.org>
-#
-# 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 2 of the License, or (at your
-# option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# 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.
-#
-#
-# TODO: Some creative ifeq ($(BUILDENV,xxx) to automatically determine
-# where we are building on and disable things (eg KLIPS on OSX)
-
-# Doc: man make
-# Doc: http://www.gnu.org/software/make/manual/make.html
-
-# Include any local Makefile.inc.local; local.mk is a wrapper
-# that deals with multiple include issues.
-include ${LIBRESWANSRCDIR}/mk/local.mk
-
-# Pull in the target/build/host description and get a definition of
-# OBJDIR et.al.
-include ${LIBRESWANSRCDIR}/mk/objdir.mk
-
-# Variables in this file with names starting with INC_ are not for use
-# by Makefiles which include it; they are subject to change without warning.
-#
-# "Final" and "finally" refer to where the files will end up on the
-# running IPsec system, as opposed to where they get installed by our
-# Makefiles. (The two are different for cross-compiles and the like,
-# where our Makefiles are not the end of the installation process.)
-# Paths with FINAL in their names are the only ones that the installed
-# software itself depends on. (Very few things should know about the
-# FINAL paths; think twice and consult Tuomo before making something new
-# depend on them.) All other paths are install targets.
-# See also DESTDIR, below.
-#
-# Note: Variables here are for Makefiles and build system only.
-# IPSEC_ prefixed variables are to be used in source code
-
-
-### boilerplate, do not change, various scripts use extended BASH syntax!
-SHELL=/bin/bash
-export SHELL
-
-.PHONY: programs man config checkprograms clean
-
-# location of shell, practicall always /bin/sh, but can be /usr/bin/sh on Fedora/RHEL
-BINSH=/bin/sh
-
-### install pathnames
-
-# DESTDIR can be used to supply a prefix to all install targets.
-# (Note that "final" pathnames, signifying where files will eventually
-# reside rather than where install puts them, are exempt from this.)
-# The prefixing is done in this file, so as to have central control over
-# it; DESTDIR itself should never appear in any other Makefile.
-DESTDIR?=
-
-# "local" part of tree, used in building other pathnames
-INC_USRLOCAL?=/usr/local
-
-# PUBDIR is where the "ipsec" command goes; beware, many things define PATH
-# settings which are assumed to include it (or at least, to include *some*
-# copy of the "ipsec" command).
-PUBDIR?=$(DESTDIR)$(INC_USRLOCAL)/sbin
-
-# BINDIR is where sub-commands get put, FINALBINDIR is where the "ipsec"
-# command will look for them when it is run. Also called LIBEXECDIR.
-FINALLIBEXECDIR?=$(INC_USRLOCAL)/libexec/ipsec
-LIBEXECDIR?=$(DESTDIR)$(FINALBINDIR)
-
-FINALBINDIR?=$(FINALLIBEXECDIR)
-BINDIR?=$(LIBEXECDIR)
-
-
-# SBINDIR is where the user interface command goes.
-FINALSBINDIR?=$(INC_USRLOCAL)/sbin
-SBINDIR?=$(DESTDIR)$(FINALSBINDIR)
-
-
-
-# where the appropriate manpage tree is located
-# location within INC_USRLOCAL
-INC_MANDIR?=man
-# the full pathname
-MANTREE?=$(DESTDIR)$(INC_USRLOCAL)/$(INC_MANDIR)
-# all relevant subdirectories of MANTREE
-MANPLACES?=man3 man5 man8
-
-# where configuration files go
-FINALSYSCONFDIR?=/etc
-
-# final configuration file
-FINALCONFFILE?=$(FINALSYSCONFDIR)/ipsec.conf
-CONFFILE?=$(DESTDIR)$(FINALCONFFILE)
-
-FINALCONFDIR?=$(FINALSYSCONFDIR)
-
-CONFDIR?=$(DESTDIR)$(FINALCONFDIR)
-SYSCONFDIR?=$(DESTDIR)$(FINALSYSCONFDIR)
-
-FINALCONFDDIR?=$(FINALCONFDIR)/ipsec.d
-CONFDDIR?=$(DESTDIR)$(FINALCONFDDIR)
-
-# sample configuration files go into
-INC_DOCDIR?=share/doc
-FINALEXAMPLECONFDIR?=$(INC_USRLOCAL)/$(INC_DOCDIR)/libreswan
-EXAMPLECONFDIR?=$(DESTDIR)$(FINALEXAMPLECONFDIR)
-
-FINALDOCDIR?=$(INC_USRLOCAL)/$(INC_DOCDIR)/libreswan
-DOCDIR?=$(DESTDIR)$(FINALDOCDIR)
-
-# where per-conn pluto logs go
-FINALVARDIR?=/var
-VARDIR?=$(DESTDIR)$(FINALVARDIR)
-FINALLOGDIR?=$(FINALVARDIR)/log
-LOGDIR?=$(DESTDIR)$(FINALLOGDIR)
-
-
-# An attempt is made to automatically figure out where boot/shutdown scripts
-# will finally go: the first directory in INC_RCDIRS which exists gets them.
-# If none of those exists (or INC_RCDIRS is empty), INC_RCDEFAULT gets them.
-# With a non-null DESTDIR, INC_RCDEFAULT will be used unless one of the
-# INC_RCDIRS directories has been pre-created under DESTDIR.
-INC_RCDIRS?=/etc/rc.d/init.d /etc/rc.d /etc/init.d /sbin/init.d
-INC_RCDEFAULT?=/etc/rc.d/init.d
-
-# RCDIR is where boot/shutdown scripts go; FINALRCDIR is where they think
-# will finally be (so utils/Makefile can create a symlink in BINDIR to the
-# place where the boot/shutdown script will finally be, rather than the
-# place where it is installed).
-FINALRCDIR?=$(shell for d in $(INC_RCDIRS) ; \
- do if test -d $(DESTDIR)/$$d ; \
- then echo $$d ; exit 0 ; \
- fi ; done ; echo $(INC_RCDEFAULT) )
-RCDIR?=$(DESTDIR)$(FINALRCDIR)
-
-
-
-### kernel pathnames
-
-# Kernel location: where patches are inserted, where kernel builds are done.
-
-# this is a hack using the wildcard to look for existence of a file/dir
-ifneq ($(wildcard /usr/src/linux-2.6),)
-KERNELSRC?=/usr/src/linux-2.6
-else
-ifneq ($(wildcard /usr/src/linux-2.4),)
-KERNELSRC?=/usr/src/linux-2.4
-else
-KERNELSRC?=/lib/modules/$(shell uname -r)/build
-endif
-endif
-
-# where kernel configuration outputs are located
-KCFILE=$(KERNELSRC)/.config
-ACFILE=$(KERNELSRC)/include/linux/autoconf.h
-VERFILE=$(KERNELSRC)/include/linux/version.h
-
-# where KLIPS kernel module is install
-OSMOD_DESTDIR?=net/ipsec
-
-# What command to use to load the modules. openwrt does not have modprobe
-MODPROBE?=modprobe -q
-
-### misc installation stuff
-
-# what program to use when installing things
-INSTALL?=install
-
-# flags to the install program, for programs, manpages, and config files
-# -b has install make backups (n.b., unlinks original), --suffix controls
-# how backup names are composed.
-# Note that the install procedures will never overwrite an existing config
-# file, which is why -b is not specified for them.
-INSTBINFLAGS?=-b --suffix=.old
-INSTSUIDFLAGS?=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
-
-# busybox install is not emulating a real install command well enough
-SWANCHECKLINK=$(shell readlink /usr/bin/install)
-ifeq ($(SWANCHECKLINK /bin/busybox),)
-INSTBINFLAGS=
-INSTSUIDFLAGS=-m 0755 -g root -o root
-endif
-
-
-INSTMANFLAGS?=--mode=0644
-INSTCONFFLAGS?=--mode=0644
-# For OSX use
-#INSTBINFLAGS?=-b -B .old
-#INSTSUIDFLAGS?=--mode=u+rxs,g+rx,o+rx --group=root -b -B .old
-
-# flags for bison, overrode in packages/default/foo
-BISONOSFLAGS?=
-
-NSSFLAGS?=$(shell pkg-config --cflags nss)
-NSSLIBS?=$(shell pkg-config --libs nss)
-
-# To build with clang, use: scan-build make programs
-#GCC=clang
-GCC?=gcc
-
-MAKE?=make
-
-# You can compile using Electric Fence - this is used for running the test suite
-# EFENCE=-lefence
-EFENCE?=
-
-ifeq ($(ARCH),i686)
-GCCM?=-m32
-endif
-ifeq ($(ARCH),x86_64)
-GCCM?=-m64
-endif
-
-GCC_LINT?=-DGCC_LINT
-
-# some defaults that cause most if not all warnings
-# eventually: -Wshadow
-WERROR?=-Wall -Wextra -Wformat -Wformat-nonliteral -Wformat-security -Wundef -Wmissing-declarations -Wredundant-decls -Wnested-externs #-pedantic
-
-### misc configuration, included here in hopes that other files will not
-### have to be changed for common customizations.
-
-# extra compile flags, for userland and kernel stuff, e.g. -g for debug info
-# you can add to this in the defaults file using +=
-# -DGCC_LINT uses gcc-specific declarations to improve compile-time diagnostics.
-# -DCOMPILER_HAS_NO_PRINTF_LIKE if your old compiler gives you errors with
-# PRINTF_LIKE(x)
-#
-# Warning: Using -O3 is known to cause problems with the NSS code, see
-# https://bugzilla.redhat.com/show_bug.cgi?id=884710
-#
-# Example for a cross compile:
-# USERCOMPILE?=-g ${PORTDEFINE} -I/usr/local/arm_tools/arm-elf/inc -L/usr/local/arm_tools/lib/gcc-lib
-# USERCOMPILE?=-g -O2 ${WERROR} ${GCC_LINT}
-USERCOMPILE?=-g -O2 ${GCCM} ${WERROR} ${GCC_LINT} -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-all -fno-strict-aliasing -fPIE -DPIE -DFORCE_PR_ASSERT
-
-KLIPSCOMPILE?=-O2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM
-# You can also run this before starting libreswan on glibc systems:
-#export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
-
-# extra link flags
-USERLINK?=-Wl,-z,relro,-z,now -g -pie ${EFENCE}
-
-PORTINCLUDE?=
-
-# command used to link/copy KLIPS into kernel source tree
-# There are good reasons why this is "ln -s"; only people like distribution
-# builders should ever change it.
-KLIPSLINK?=ln -s -f
-
-# extra options for use in kernel build
-KERNMAKEOPTS?=
-
-# kernel Makefile targets to be done before build
-# Can be overridden if you are *sure* your kernel doesn't need them. (2.2.xx
-# and later reportedly do not.)
-KERNDEP?=dep
-KERNCLEAN?=clean
-
-# kernel make name: zImage for 2.0.xx, bzImage for 2.2.xx and later, and
-# boot on non-x86s (what ever happened to standards?)
-INC_B?=$(shell test -d $(DIRIN22) && echo b)
-KERNEL?=$(shell if expr " `uname -m`" : ' i.86' >/dev/null ; \
- then echo $(INC_B)zImage ; \
- else echo boot ; \
- fi)
-
-# look for XMLTO command
-XMLTO?=$(shell which xmlto | grep / | head -n1)
-
-# look for POD2MAN command
-POD2MAN?=$(shell which pod2man | grep / | head -n1)
-
-## build environment variations
-#
-# USE_ variables determine if features are compiled into Libreswan.
-# these let you turn on/off specific features
-# HAVE_ variables let you tell Libreswan what system related libraries
-# you may or maynot have
-
-# Enable support for DNSSEC. This requires the unbound library
-USE_DNSSEC?=true
-
-# Do we want all the configuration files like ipsec.conf and ipsec.secrets
-# and any certificates to be in a single directory defined by
-# FINALCONFDDIR?
-USE_SINGLE_CONF_DIR?=false
-
-# Build support for KEY RR
-# this will become false in the future, as all OE sites transition to
-# using IPSECKEY instead of KEY records. See references to 'Flag Day'
-# Except this to change in Q1 2011
-USE_KEYRR?=true
-
-# Build support for Linux 2.4 and 2.6 KLIPS kernel level IPsec support
-# for pluto
-USE_KLIPS?=true
-
-# Build support for 2.6 KLIPS/MAST variation in pluto
-USE_MAST?=true
-
-# MAST requires KLIPS
-ifeq ($(USE_MAST),true)
-USE_KLIPS=true
-endif
-
-# MAST is generally a prerequisite for SAREF support in applications
-USE_SAREF_KERNEL?=false
-
-# Build support for Linux NETKEY (XFRM) kernel level IPsec support for
-# pluto (aka "native", "kame")
-USE_NETKEY?=true
-
-# KLIPS needs PFKEYv2, but sometimes we want PFKEY without KLIPS
-# Note: NETLINK does not use PFKEY, but it does share some code,
-# so it is required for NETKEY as well.
-ifeq ($(USE_KLIPS),true)
-USE_PFKEYv2=true
-else
-ifeq ($(USE_NETKEY),true)
-USE_PFKEYv2=true
-endif
-endif
-
-# include support for BSD/KAME IPsec in pluto (on *BSD and OSX)
-USE_BSDKAME?=false
-ifeq ($(USE_BSDKAME),true)
-USE_NETKEY=false
-USE_KLIPS=false
-endif
-
-# include PAM support for XAUTH when available on the platform
-
-ifeq ($(OSDEP),linux)
-USE_XAUTHPAM?=true
-endif
-ifeq ($(OSDEP),bsd)
-USE_XAUTHPAM?=true
-endif
-ifeq ($(OSDEP),darwin)
-USE_XAUTHPAM?=true
-endif
-ifeq ($(OSDEP),sunos)
-USE_XAUTHPAM?=true
-endif
-
-# Build support for integrity check for libreswan on startup
-USE_FIPSCHECK?=false
-FIPSPRODUCTCHECK?=/etc/system-fips
-
-# Build support for the Linux Audit system
-ifeq ($(OSDEP),linux)
-USE_LINUX_AUDIT?=false
-endif
-
-# Enable Labeled IPSec Functionality (requires SElinux)
-USE_LABELED_IPSEC?=false
-
-# Support for LIBCAP-NG to drop unneeded capabilities for the pluto daemon
-USE_LIBCAP_NG?=true
-ifeq ($(OSDEP),darwin)
-USE_LIBCAP_NG=false
-endif
-
-# Support for Network Manager
-USE_NM?=true
-ifeq ($(OSDEP),darwin)
-USE_NM=false
-endif
-
-# Include LDAP support (currently used for fetching CRLs)
-USE_LDAP?=false
-
-# Include libcurl support (currently used for fetching CRLs)
-USE_LIBCURL?=true
-
-# should we include additional (strong) algorithms? It adds a measureable
-# amount of code space to pluto, and many of the algorithms have not had
-# the same scrutiny that AES and 3DES have received, but offers possibilities
-# of switching away from AES/3DES quickly.
-USE_EXTRACRYPTO?=true
-
-# Do we want to limit the number of ipsec connections artificially
-USE_IPSEC_CONNECTION_LIMIT?=false
-IPSEC_CONNECTION_LIMIT?=250
-
-# For Angstrom linux with broken popen() set to true. See bug #1067
-HAVE_BROKEN_POPEN?=false
-
-# For systems with no fork (uclibc nommu)
-HAVE_NO_FORK?=false
-
-NONINTCONFIG=oldconfig
-
--include ${LIBRESWANSRCDIR}/Makefile.ver
-
-# make sure we only run this once per build, its too expensive to run
-# every time Makefile.inc is included
-ifndef IPSECVERSION
-IPSECVERSION:=$(shell ${LIBRESWANSRCDIR}/packaging/utils/setlibreswanversion ${IPSECBASEVERSION} ${LIBRESWANSRCDIR})
-export IPSECVERSION
-# VID is a somewhat shortened version, eg "3.5" or "3.5-xxx"
-IPSECVIDVERSION:=$(shell echo ${IPSECVERSION} | sed 's/^\([^-]*\)-\([^-]*\)-.*/\1-\2/')
-export IPSECVIDVERSION
-endif
-
-# include OSDEP/ARCH specific makefiles, if any.
-include ${LIBRESWANSRCDIR}/packaging/defaults/${BUILDENV}
--include ${LIBRESWANSRCDIR}/packaging/defaults/${BUILDENV}.${ARCH}
-
-# On MAC OSX , we have to use YACC and not BISON. And use different backup
-# file suffix.
-ifeq ($(BUILDENV),"darwin")
-USE_YACC?=true
-INSTBINFLAGS=-D -b -B .old
-INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b -B .old
-endif
-
-OBJDIRTOP?=${LIBRESWANSRCDIR}/${OBJDIR}
-
-#
-# Paranoia says to export these just to sure:
-export OBJDIR
-export OBJDIRTOP
-
-
-### paths within the source tree
-
-KLIPSINC=${LIBRESWANSRCDIR}/linux/include
-KLIPSSRCDIR=${LIBRESWANSRCDIR}/linux/net/ipsec
-#KLIPSSRCDIR=/mara1/git/klips/net/ipsec
-
-LIBSWANDIR=${LIBRESWANSRCDIR}/lib/libswan
-LIBRESWANLIB=${OBJDIRTOP}/lib/libswan/libswan.a
-LSWLOGLIB=${OBJDIRTOP}/lib/libswan/liblswlog.a
-
-LIBDESSRCDIR=${LIBRESWANSRCDIR}/linux/crypto/ciphers/des
-LIBMD5=${OBJDIRTOP}/lib/libcrypto/libmd5/libmd5.a
-LIBSHA1=${OBJDIRTOP}/lib/libcrypto/libsha1/libsha1.a
-LIBTWOFISH=${OBJDIRTOP}/lib/libcrypto/libtwofish/libtwofish.a
-LIBSERPENT=${OBJDIRTOP}/lib/libcrypto/libserpent/libserpent.a
-LIBSHA2=${OBJDIRTOP}/lib/libcrypto/libsha2/libsha2.a
-LIBAES_XCBC=${OBJDIRTOP}/lib/libcrypto/libaes_xcbc/libaes_xcbc.a
-CRYPTOLIBS=${LIBSHA1} ${LIBMD5} ${LIBSHA2} ${LIBAES_XCBC}
-
-ifeq ($(USE_EXTRACRYPTO),true)
-CRYPTOLIBS+= ${LIBSERPENT} ${LIBTWOFISH}
-endif
-
-WHACKLIB=${OBJDIRTOP}/lib/libwhack/libwhack.a
-IPSECCONFLIB=${OBJDIRTOP}/lib/libipsecconf/libipsecconf.a
-
-# export everything so that scripts can use them.
-export LIBSWANDIR LIBRESWANSRCDIR ARCH PORTINCLUDE
-export LIBRESWANLIB LSWLOGLIB
-export LIBDESSRCDIR
-export LIBMD5 LIBSHA1 LIBTWOFISH LIBSERPENT
-export LIBSHA2 LIBAES_XCBC CRYPTOLIBS WHACKLIB IPSECCONFLIB
-export NSSFLAGS NSSLIBS
-
-#KERNELBUILDMFLAGS=--debug=biv V=1
-
-# how to do variable substitution in sed-transformed files
-TRANSFORM_VARIABLES = sed -e "s:@IPSECVERSION@:$(IPSECVERSION):g" \
- -e "/@${OSDEP}_START@/,/@${OSDEP}_END@/d" \
- -e "s:@BINSH@:$(BINSH):g" \
- -e "s:@EXAMPLECONFDIR@:$(EXAMPLECONFDIR):g" \
- -e "s:@FINALBINDIR@:$(FINALBINDIR):g" \
- -e "s:@FINALCONFDDIR@:$(FINALCONFDDIR):g" \
- -e "s:@FINALCONFDIR@:$(FINALCONFDIR):g" \
- -e "s:@FINALCONFFILE@:$(FINALCONFFILE):g" \
- -e "s:@FINALDOCDIR@:$(FINALDOCDIR):g" \
- -e "s:@FINALEXAMPLECONFDIR@:$(FINALEXAMPLECONFDIR):g" \
- -e "s:@FINALLIBEXECDIR@:$(FINALLIBEXECDIR):g" \
- -e "s:@FINALRCDIR@:$(FINALRCDIR):g" \
- -e "s:@FINALSBINDIR@:$(FINALSBINDIR):g" \
- -e "s:@FINALSYSCONFDIR@:$(FINALSYSCONFDIR):g" \
- -e "s:@FINALVARDIR@:$(FINALVARDIR):g" \
- -e "s:@IPSEC_CONF@:$(FINALCONFFILE):g" \
- -e "s:@IPSEC_CONFDDIR@:$(FINALCONFDDIR):g" \
- -e "s:@IPSEC_DIR@:$(FINALBINDIR):g" \
- -e "s:@IPSEC_EXECDIR@:$(FINALLIBEXECDIR):g" \
- -e "s:@IPSEC_VARDIR@:$(FINALVARDIR):g" \
- -e "s:@IPSEC_SBINDIR@:$(FINALSBINDIR):g" \
- -e "s:@MODPROBE@:$(MODPROBE):g" \
- -e "s:@USE_DEFAULT_CONNS@:$(USE_DEFAULT_CONNS):g" \
-
-# For KVM testing setup
-#POOL?=${LIBRESWANSRCDIR}/pool
-POOL?=/vol/pool
-# support types are fedora and ubuntu
-OSTYPE?=fedora
-#OSMEDIA?=http://fedora.mirror.nexicom.net/linux/releases/17/Fedora/x86_64/os/
-OSMEDIA?=http://76.10.157.69/linux/releases/17/Fedora/x86_64/os
-
-# Ubuntu media
-# OSTYPE?=ubuntu
-# OSMEDIA?=http://ftp.ubuntu.com/ubuntu/dists/precise/main/installer-amd64/
+# For compatibility, new code should include mk/config.mk directly.
+include ${LIBRESWANSRCDIR}/mk/config.mk
diff --git a/Makefile.ver b/Makefile.ver
index cac11e1..3114ac0 100644
--- a/Makefile.ver
+++ b/Makefile.ver
@@ -1 +1,2 @@
-IPSECBASEVERSION?=3.master-$(shell date +%Y%V).git
+# For compatibility, new code should include mk/version.mk directly.
+include ${LIBRESWANSRCDIR}/mk/version.mk
diff --git a/mk/config.mk b/mk/config.mk
new file mode 100644
index 0000000..2ec84db
--- /dev/null
+++ b/mk/config.mk
@@ -0,0 +1,509 @@
+# Libreswan pathnames and other master configuration
+#
+# Copyright (C) 2001, 2002 Henry Spencer.
+# Copyright (C) 2003-2006 Xelerance Corporation
+# Copyright (C) 2012 Paul Wouters <paul at libreswan.org>
+# Copyright (C) 2015 Andrew Cagney <cagney at gnu.org>
+#
+# 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 2 of the License, or (at your
+# option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
+#
+# 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.
+#
+#
+# TODO: Some creative ifeq ($(BUILDENV,xxx) to automatically determine
+# where we are building on and disable things (eg KLIPS on OSX)
+
+# Doc: man make
+# Doc: http://www.gnu.org/software/make/manual/make.html
+
+# Include any local Makefile.inc.local; local.mk is a wrapper
+# that deals with multiple include issues.
+include ${LIBRESWANSRCDIR}/mk/local.mk
+
+# Pull in the target/build/host description and get a definition of
+# OBJDIR et.al.
+include ${LIBRESWANSRCDIR}/mk/objdir.mk
+
+# Variables in this file with names starting with INC_ are not for use
+# by Makefiles which include it; they are subject to change without warning.
+#
+# "Final" and "finally" refer to where the files will end up on the
+# running IPsec system, as opposed to where they get installed by our
+# Makefiles. (The two are different for cross-compiles and the like,
+# where our Makefiles are not the end of the installation process.)
+# Paths with FINAL in their names are the only ones that the installed
+# software itself depends on. (Very few things should know about the
+# FINAL paths; think twice and consult Tuomo before making something new
+# depend on them.) All other paths are install targets.
+# See also DESTDIR, below.
+#
+# Note: Variables here are for Makefiles and build system only.
+# IPSEC_ prefixed variables are to be used in source code
+
+
+### boilerplate, do not change, various scripts use extended BASH syntax!
+SHELL=/bin/bash
+export SHELL
+
+.PHONY: programs man config checkprograms clean
+
+# location of shell, practicall always /bin/sh, but can be /usr/bin/sh on Fedora/RHEL
+BINSH=/bin/sh
+
+### install pathnames
+
+# DESTDIR can be used to supply a prefix to all install targets.
+# (Note that "final" pathnames, signifying where files will eventually
+# reside rather than where install puts them, are exempt from this.)
+# The prefixing is done in this file, so as to have central control over
+# it; DESTDIR itself should never appear in any other Makefile.
+DESTDIR?=
+
+# "local" part of tree, used in building other pathnames
+INC_USRLOCAL?=/usr/local
+
+# PUBDIR is where the "ipsec" command goes; beware, many things define PATH
+# settings which are assumed to include it (or at least, to include *some*
+# copy of the "ipsec" command).
+PUBDIR?=$(DESTDIR)$(INC_USRLOCAL)/sbin
+
+# BINDIR is where sub-commands get put, FINALBINDIR is where the "ipsec"
+# command will look for them when it is run. Also called LIBEXECDIR.
+FINALLIBEXECDIR?=$(INC_USRLOCAL)/libexec/ipsec
+LIBEXECDIR?=$(DESTDIR)$(FINALBINDIR)
+
+FINALBINDIR?=$(FINALLIBEXECDIR)
+BINDIR?=$(LIBEXECDIR)
+
+
+# SBINDIR is where the user interface command goes.
+FINALSBINDIR?=$(INC_USRLOCAL)/sbin
+SBINDIR?=$(DESTDIR)$(FINALSBINDIR)
+
+
+
+# where the appropriate manpage tree is located
+# location within INC_USRLOCAL
+INC_MANDIR?=man
+# the full pathname
+MANTREE?=$(DESTDIR)$(INC_USRLOCAL)/$(INC_MANDIR)
+# all relevant subdirectories of MANTREE
+MANPLACES?=man3 man5 man8
+
+# where configuration files go
+FINALSYSCONFDIR?=/etc
+
+# final configuration file
+FINALCONFFILE?=$(FINALSYSCONFDIR)/ipsec.conf
+CONFFILE?=$(DESTDIR)$(FINALCONFFILE)
+
+FINALCONFDIR?=$(FINALSYSCONFDIR)
+
+CONFDIR?=$(DESTDIR)$(FINALCONFDIR)
+SYSCONFDIR?=$(DESTDIR)$(FINALSYSCONFDIR)
+
+FINALCONFDDIR?=$(FINALCONFDIR)/ipsec.d
+CONFDDIR?=$(DESTDIR)$(FINALCONFDDIR)
+
+# sample configuration files go into
+INC_DOCDIR?=share/doc
+FINALEXAMPLECONFDIR?=$(INC_USRLOCAL)/$(INC_DOCDIR)/libreswan
+EXAMPLECONFDIR?=$(DESTDIR)$(FINALEXAMPLECONFDIR)
+
+FINALDOCDIR?=$(INC_USRLOCAL)/$(INC_DOCDIR)/libreswan
+DOCDIR?=$(DESTDIR)$(FINALDOCDIR)
+
+# where per-conn pluto logs go
+FINALVARDIR?=/var
+VARDIR?=$(DESTDIR)$(FINALVARDIR)
+FINALLOGDIR?=$(FINALVARDIR)/log
+LOGDIR?=$(DESTDIR)$(FINALLOGDIR)
+
+
+# An attempt is made to automatically figure out where boot/shutdown scripts
+# will finally go: the first directory in INC_RCDIRS which exists gets them.
+# If none of those exists (or INC_RCDIRS is empty), INC_RCDEFAULT gets them.
+# With a non-null DESTDIR, INC_RCDEFAULT will be used unless one of the
+# INC_RCDIRS directories has been pre-created under DESTDIR.
+INC_RCDIRS?=/etc/rc.d/init.d /etc/rc.d /etc/init.d /sbin/init.d
+INC_RCDEFAULT?=/etc/rc.d/init.d
+
+# RCDIR is where boot/shutdown scripts go; FINALRCDIR is where they think
+# will finally be (so utils/Makefile can create a symlink in BINDIR to the
+# place where the boot/shutdown script will finally be, rather than the
+# place where it is installed).
+FINALRCDIR?=$(shell for d in $(INC_RCDIRS) ; \
+ do if test -d $(DESTDIR)/$$d ; \
+ then echo $$d ; exit 0 ; \
+ fi ; done ; echo $(INC_RCDEFAULT) )
+RCDIR?=$(DESTDIR)$(FINALRCDIR)
+
+
+
+### kernel pathnames
+
+# Kernel location: where patches are inserted, where kernel builds are done.
+
+# this is a hack using the wildcard to look for existence of a file/dir
+ifneq ($(wildcard /usr/src/linux-2.6),)
+KERNELSRC?=/usr/src/linux-2.6
+else
+ifneq ($(wildcard /usr/src/linux-2.4),)
+KERNELSRC?=/usr/src/linux-2.4
+else
+KERNELSRC?=/lib/modules/$(shell uname -r)/build
+endif
+endif
+
+# where kernel configuration outputs are located
+KCFILE=$(KERNELSRC)/.config
+ACFILE=$(KERNELSRC)/include/linux/autoconf.h
+VERFILE=$(KERNELSRC)/include/linux/version.h
+
+# where KLIPS kernel module is install
+OSMOD_DESTDIR?=net/ipsec
+
+# What command to use to load the modules. openwrt does not have modprobe
+MODPROBE?=modprobe -q
+
+### misc installation stuff
+
+# what program to use when installing things
+INSTALL?=install
+
+# flags to the install program, for programs, manpages, and config files
+# -b has install make backups (n.b., unlinks original), --suffix controls
+# how backup names are composed.
+# Note that the install procedures will never overwrite an existing config
+# file, which is why -b is not specified for them.
+INSTBINFLAGS?=-b --suffix=.old
+INSTSUIDFLAGS?=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
+
+# busybox install is not emulating a real install command well enough
+SWANCHECKLINK=$(shell readlink /usr/bin/install)
+ifeq ($(SWANCHECKLINK /bin/busybox),)
+INSTBINFLAGS=
+INSTSUIDFLAGS=-m 0755 -g root -o root
+endif
+
+
+INSTMANFLAGS?=--mode=0644
+INSTCONFFLAGS?=--mode=0644
+# For OSX use
+#INSTBINFLAGS?=-b -B .old
+#INSTSUIDFLAGS?=--mode=u+rxs,g+rx,o+rx --group=root -b -B .old
+
+# flags for bison, overrode in packages/default/foo
+BISONOSFLAGS?=
+
+NSSFLAGS?=$(shell pkg-config --cflags nss)
+NSSLIBS?=$(shell pkg-config --libs nss)
+
+# To build with clang, use: scan-build make programs
+#GCC=clang
+GCC?=gcc
+
+MAKE?=make
+
+# You can compile using Electric Fence - this is used for running the test suite
+# EFENCE=-lefence
+EFENCE?=
+
+ifeq ($(ARCH),i686)
+GCCM?=-m32
+endif
+ifeq ($(ARCH),x86_64)
+GCCM?=-m64
+endif
+
+GCC_LINT?=-DGCC_LINT
+
+# some defaults that cause most if not all warnings
+# eventually: -Wshadow
+WERROR?=-Wall -Wextra -Wformat -Wformat-nonliteral -Wformat-security -Wundef -Wmissing-declarations -Wredundant-decls -Wnested-externs #-pedantic
+
+### misc configuration, included here in hopes that other files will not
+### have to be changed for common customizations.
+
+# extra compile flags, for userland and kernel stuff, e.g. -g for debug info
+# you can add to this in the defaults file using +=
+# -DGCC_LINT uses gcc-specific declarations to improve compile-time diagnostics.
+# -DCOMPILER_HAS_NO_PRINTF_LIKE if your old compiler gives you errors with
+# PRINTF_LIKE(x)
+#
+# Warning: Using -O3 is known to cause problems with the NSS code, see
+# https://bugzilla.redhat.com/show_bug.cgi?id=884710
+#
+# Example for a cross compile:
+# USERCOMPILE?=-g ${PORTDEFINE} -I/usr/local/arm_tools/arm-elf/inc -L/usr/local/arm_tools/lib/gcc-lib
+# USERCOMPILE?=-g -O2 ${WERROR} ${GCC_LINT}
+USERCOMPILE?=-g -O2 ${GCCM} ${WERROR} ${GCC_LINT} -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-all -fno-strict-aliasing -fPIE -DPIE -DFORCE_PR_ASSERT
+
+KLIPSCOMPILE?=-O2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM
+# You can also run this before starting libreswan on glibc systems:
+#export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
+
+# extra link flags
+USERLINK?=-Wl,-z,relro,-z,now -g -pie ${EFENCE}
+
+PORTINCLUDE?=
+
+# command used to link/copy KLIPS into kernel source tree
+# There are good reasons why this is "ln -s"; only people like distribution
+# builders should ever change it.
+KLIPSLINK?=ln -s -f
+
+# extra options for use in kernel build
+KERNMAKEOPTS?=
+
+# kernel Makefile targets to be done before build
+# Can be overridden if you are *sure* your kernel doesn't need them. (2.2.xx
+# and later reportedly do not.)
+KERNDEP?=dep
+KERNCLEAN?=clean
+
+# kernel make name: zImage for 2.0.xx, bzImage for 2.2.xx and later, and
+# boot on non-x86s (what ever happened to standards?)
+INC_B?=$(shell test -d $(DIRIN22) && echo b)
+KERNEL?=$(shell if expr " `uname -m`" : ' i.86' >/dev/null ; \
+ then echo $(INC_B)zImage ; \
+ else echo boot ; \
+ fi)
+
+# look for XMLTO command
+XMLTO?=$(shell which xmlto | grep / | head -n1)
+
+# look for POD2MAN command
+POD2MAN?=$(shell which pod2man | grep / | head -n1)
+
+## build environment variations
+#
+# USE_ variables determine if features are compiled into Libreswan.
+# these let you turn on/off specific features
+# HAVE_ variables let you tell Libreswan what system related libraries
+# you may or maynot have
+
+# Enable support for DNSSEC. This requires the unbound library
+USE_DNSSEC?=true
+
+# Do we want all the configuration files like ipsec.conf and ipsec.secrets
+# and any certificates to be in a single directory defined by
+# FINALCONFDDIR?
+USE_SINGLE_CONF_DIR?=false
+
+# Build support for KEY RR
+# this will become false in the future, as all OE sites transition to
+# using IPSECKEY instead of KEY records. See references to 'Flag Day'
+# Except this to change in Q1 2011
+USE_KEYRR?=true
+
+# Build support for Linux 2.4 and 2.6 KLIPS kernel level IPsec support
+# for pluto
+USE_KLIPS?=true
+
+# Build support for 2.6 KLIPS/MAST variation in pluto
+USE_MAST?=true
+
+# MAST requires KLIPS
+ifeq ($(USE_MAST),true)
+USE_KLIPS=true
+endif
+
+# MAST is generally a prerequisite for SAREF support in applications
+USE_SAREF_KERNEL?=false
+
+# Build support for Linux NETKEY (XFRM) kernel level IPsec support for
+# pluto (aka "native", "kame")
+USE_NETKEY?=true
+
+# KLIPS needs PFKEYv2, but sometimes we want PFKEY without KLIPS
+# Note: NETLINK does not use PFKEY, but it does share some code,
+# so it is required for NETKEY as well.
+ifeq ($(USE_KLIPS),true)
+USE_PFKEYv2=true
+else
+ifeq ($(USE_NETKEY),true)
+USE_PFKEYv2=true
+endif
+endif
+
+# include support for BSD/KAME IPsec in pluto (on *BSD and OSX)
+USE_BSDKAME?=false
+ifeq ($(USE_BSDKAME),true)
+USE_NETKEY=false
+USE_KLIPS=false
+endif
+
+# include PAM support for XAUTH when available on the platform
+
+ifeq ($(OSDEP),linux)
+USE_XAUTHPAM?=true
+endif
+ifeq ($(OSDEP),bsd)
+USE_XAUTHPAM?=true
+endif
+ifeq ($(OSDEP),darwin)
+USE_XAUTHPAM?=true
+endif
+ifeq ($(OSDEP),sunos)
+USE_XAUTHPAM?=true
+endif
+
+# Build support for integrity check for libreswan on startup
+USE_FIPSCHECK?=false
+FIPSPRODUCTCHECK?=/etc/system-fips
+
+# Build support for the Linux Audit system
+ifeq ($(OSDEP),linux)
+USE_LINUX_AUDIT?=false
+endif
+
+# Enable Labeled IPSec Functionality (requires SElinux)
+USE_LABELED_IPSEC?=false
+
+# Support for LIBCAP-NG to drop unneeded capabilities for the pluto daemon
+USE_LIBCAP_NG?=true
+ifeq ($(OSDEP),darwin)
+USE_LIBCAP_NG=false
+endif
+
+# Support for Network Manager
+USE_NM?=true
+ifeq ($(OSDEP),darwin)
+USE_NM=false
+endif
+
+# Include LDAP support (currently used for fetching CRLs)
+USE_LDAP?=false
+
+# Include libcurl support (currently used for fetching CRLs)
+USE_LIBCURL?=true
+
+# should we include additional (strong) algorithms? It adds a measureable
+# amount of code space to pluto, and many of the algorithms have not had
+# the same scrutiny that AES and 3DES have received, but offers possibilities
+# of switching away from AES/3DES quickly.
+USE_EXTRACRYPTO?=true
+
+# Do we want to limit the number of ipsec connections artificially
+USE_IPSEC_CONNECTION_LIMIT?=false
+IPSEC_CONNECTION_LIMIT?=250
+
+# For Angstrom linux with broken popen() set to true. See bug #1067
+HAVE_BROKEN_POPEN?=false
+
+# For systems with no fork (uclibc nommu)
+HAVE_NO_FORK?=false
+
+NONINTCONFIG=oldconfig
+
+-include ${LIBRESWANSRCDIR}/Makefile.ver
+
+# make sure we only run this once per build, its too expensive to run
+# every time Makefile.inc is included
+ifndef IPSECVERSION
+IPSECVERSION:=$(shell ${LIBRESWANSRCDIR}/packaging/utils/setlibreswanversion ${IPSECBASEVERSION} ${LIBRESWANSRCDIR})
+export IPSECVERSION
+# VID is a somewhat shortened version, eg "3.5" or "3.5-xxx"
+IPSECVIDVERSION:=$(shell echo ${IPSECVERSION} | sed 's/^\([^-]*\)-\([^-]*\)-.*/\1-\2/')
+export IPSECVIDVERSION
+endif
+
+# include OSDEP/ARCH specific makefiles, if any.
+include ${LIBRESWANSRCDIR}/packaging/defaults/${BUILDENV}
+-include ${LIBRESWANSRCDIR}/packaging/defaults/${BUILDENV}.${ARCH}
+
+# On MAC OSX , we have to use YACC and not BISON. And use different backup
+# file suffix.
+ifeq ($(BUILDENV),"darwin")
+USE_YACC?=true
+INSTBINFLAGS=-D -b -B .old
+INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b -B .old
+endif
+
+OBJDIRTOP?=${LIBRESWANSRCDIR}/${OBJDIR}
+
+#
+# Paranoia says to export these just to sure:
+export OBJDIR
+export OBJDIRTOP
+
+
+### paths within the source tree
+
+KLIPSINC=${LIBRESWANSRCDIR}/linux/include
+KLIPSSRCDIR=${LIBRESWANSRCDIR}/linux/net/ipsec
+#KLIPSSRCDIR=/mara1/git/klips/net/ipsec
+
+LIBSWANDIR=${LIBRESWANSRCDIR}/lib/libswan
+LIBRESWANLIB=${OBJDIRTOP}/lib/libswan/libswan.a
+LSWLOGLIB=${OBJDIRTOP}/lib/libswan/liblswlog.a
+
+LIBDESSRCDIR=${LIBRESWANSRCDIR}/linux/crypto/ciphers/des
+LIBMD5=${OBJDIRTOP}/lib/libcrypto/libmd5/libmd5.a
+LIBSHA1=${OBJDIRTOP}/lib/libcrypto/libsha1/libsha1.a
+LIBTWOFISH=${OBJDIRTOP}/lib/libcrypto/libtwofish/libtwofish.a
+LIBSERPENT=${OBJDIRTOP}/lib/libcrypto/libserpent/libserpent.a
+LIBSHA2=${OBJDIRTOP}/lib/libcrypto/libsha2/libsha2.a
+LIBAES_XCBC=${OBJDIRTOP}/lib/libcrypto/libaes_xcbc/libaes_xcbc.a
+CRYPTOLIBS=${LIBSHA1} ${LIBMD5} ${LIBSHA2} ${LIBAES_XCBC}
+
+ifeq ($(USE_EXTRACRYPTO),true)
+CRYPTOLIBS+= ${LIBSERPENT} ${LIBTWOFISH}
+endif
+
+WHACKLIB=${OBJDIRTOP}/lib/libwhack/libwhack.a
+IPSECCONFLIB=${OBJDIRTOP}/lib/libipsecconf/libipsecconf.a
+
+# export everything so that scripts can use them.
+export LIBSWANDIR LIBRESWANSRCDIR ARCH PORTINCLUDE
+export LIBRESWANLIB LSWLOGLIB
+export LIBDESSRCDIR
+export LIBMD5 LIBSHA1 LIBTWOFISH LIBSERPENT
+export LIBSHA2 LIBAES_XCBC CRYPTOLIBS WHACKLIB IPSECCONFLIB
+export NSSFLAGS NSSLIBS
+
+#KERNELBUILDMFLAGS=--debug=biv V=1
+
+# how to do variable substitution in sed-transformed files
+TRANSFORM_VARIABLES = sed -e "s:@IPSECVERSION@:$(IPSECVERSION):g" \
+ -e "/@${OSDEP}_START@/,/@${OSDEP}_END@/d" \
+ -e "s:@BINSH@:$(BINSH):g" \
+ -e "s:@EXAMPLECONFDIR@:$(EXAMPLECONFDIR):g" \
+ -e "s:@FINALBINDIR@:$(FINALBINDIR):g" \
+ -e "s:@FINALCONFDDIR@:$(FINALCONFDDIR):g" \
+ -e "s:@FINALCONFDIR@:$(FINALCONFDIR):g" \
+ -e "s:@FINALCONFFILE@:$(FINALCONFFILE):g" \
+ -e "s:@FINALDOCDIR@:$(FINALDOCDIR):g" \
+ -e "s:@FINALEXAMPLECONFDIR@:$(FINALEXAMPLECONFDIR):g" \
+ -e "s:@FINALLIBEXECDIR@:$(FINALLIBEXECDIR):g" \
+ -e "s:@FINALRCDIR@:$(FINALRCDIR):g" \
+ -e "s:@FINALSBINDIR@:$(FINALSBINDIR):g" \
+ -e "s:@FINALSYSCONFDIR@:$(FINALSYSCONFDIR):g" \
+ -e "s:@FINALVARDIR@:$(FINALVARDIR):g" \
+ -e "s:@IPSEC_CONF@:$(FINALCONFFILE):g" \
+ -e "s:@IPSEC_CONFDDIR@:$(FINALCONFDDIR):g" \
+ -e "s:@IPSEC_DIR@:$(FINALBINDIR):g" \
+ -e "s:@IPSEC_EXECDIR@:$(FINALLIBEXECDIR):g" \
+ -e "s:@IPSEC_VARDIR@:$(FINALVARDIR):g" \
+ -e "s:@IPSEC_SBINDIR@:$(FINALSBINDIR):g" \
+ -e "s:@MODPROBE@:$(MODPROBE):g" \
+ -e "s:@USE_DEFAULT_CONNS@:$(USE_DEFAULT_CONNS):g" \
+
+# For KVM testing setup
+#POOL?=${LIBRESWANSRCDIR}/pool
+POOL?=/vol/pool
+# support types are fedora and ubuntu
+OSTYPE?=fedora
+#OSMEDIA?=http://fedora.mirror.nexicom.net/linux/releases/17/Fedora/x86_64/os/
+OSMEDIA?=http://76.10.157.69/linux/releases/17/Fedora/x86_64/os
+
+# Ubuntu media
+# OSTYPE?=ubuntu
+# OSMEDIA?=http://ftp.ubuntu.com/ubuntu/dists/precise/main/installer-amd64/
diff --git a/mk/version.mk b/mk/version.mk
new file mode 100644
index 0000000..cac11e1
--- /dev/null
+++ b/mk/version.mk
@@ -0,0 +1 @@
+IPSECBASEVERSION?=3.master-$(shell date +%Y%V).git
commit 0785a074802d3e8b3eaebc008fa54e2633b5286b
Author: Andrew Cagney <cagney at gnu.org>
Date: Mon Feb 23 13:48:52 2015 -0500
building: switch lib/libipsecdonf to using mk/depend.mk
Also clean up bison and lex rules.
diff --git a/lib/libipsecconf/Makefile b/lib/libipsecconf/Makefile
index 9e68910..2b5f8dd 100644
--- a/lib/libipsecconf/Makefile
+++ b/lib/libipsecconf/Makefile
@@ -1,6 +1,8 @@
# Libreswan library for parsing configuration files
+#
# Copyright (C) 2005 Michael Richardson <mcr at xelerance.com> Xelerance Corporation
# Copyright (C) 2012 Paul Wouters <paul at libreswan.org>
+# Copyright (C) 2015 Andrew Cagney <cagney at gnu.org>
#
# 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
@@ -12,11 +14,12 @@
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
+ifndef top_srcdir
+include ../../mk/dirs.mk
+endif
-LIBRESWANSRCDIR?=$(shell cd ../..; pwd)
-
-include ${LIBRESWANSRCDIR}/Makefile.inc
-include ${LIBRESWANSRCDIR}/Makefile.ver
+include $(top_srcdir)/mk/config.mk
+include $(top_srcdir)/mk/version.mk
LIBRARY=ipsecconf
LIB=lib${LIBRARY}.a
@@ -44,20 +47,24 @@ endif
OBJS=${SRCS:.c=.o}
-include ${SRCDIR}../Makefile.library
-
-keywords.c: parser.tab.h
+include $(top_srcdir)/mk/library.mk
-lex.yy.c: parser.tab.c parser.l parser.y
- $(LEX) ${SRCDIR}parser.l
+# Hack to force the generated files to be built first. Not too bad
+# since all the $(OBJS) indirectly depend on the header anyway.
+$(OBJS): parser.tab.h
-parser.tab.h parser.tab.c: parser.l parser.y
- $(BISON) ${BISONOSFLAGS} -v -d ${SRCDIR}parser.y
+# Use UNIX basename to strip off the directory.
+lex.yy.c: parser.l
+ cd $(builddir) && $(LEX) $(srcdir)/$$(basename $<)
-cleanall::
- $(RM) -f parser.tab.* lex.yy.* Makefile.depend
+# Use wild card rule so that GNU Make knows that both are output from
+# single program. Use UNIX basename to strip off the directory.
+%.tab.h %.tab.c: %.y
+ cd $(builddir) && $(BISON) ${BISONOSFLAGS} -v -d $(srcdir)/$$(basename $<)
-Makefile.depend: $(SRCS) $(LIBRESWANSRCDIR)/lib/libipsecconf/Makefile
- (ls $(wildcard $(addprefix ${LIBRESWANSRCDIR}/lib/libipsecconf/,$(SRCS))) | grep '\.c' | xargs ${CC} -MM ${CFLAGS} ${PORTINCLUDE} ${ALLFLAGS}) >Makefile.depend
+clean:
+ cd $(builddir) && $(RM) -f parser.tab.* lex.yy.*
--include Makefile.depend
+MK_DEPEND_FILES = $(OBJS)
+MK_DEPEND_CFLAGS = $(CFLAGS)
+-include $(top_srcdir)/mk/depend.mk
More information about the Swan-dev
mailing list