- build gets perl and gperf from configure now
- moved built sources to maintainer-clean
This commit is contained in:
parent
8b5be79d83
commit
298b06c28c
|
@ -89,6 +89,8 @@ AC_PROG_LIBTOOL
|
||||||
AC_PROG_LEX
|
AC_PROG_LEX
|
||||||
AC_PROG_YACC
|
AC_PROG_YACC
|
||||||
AC_PROG_CC(intel)
|
AC_PROG_CC(intel)
|
||||||
|
AC_PATH_PROG([GPERF], [gperf], [], [$PATH:/bin:/usr/bin:/usr/local/bin])
|
||||||
|
AC_PATH_PROG([PERL], [perl], [], [$PATH:/bin:/usr/bin:/usr/local/bin])
|
||||||
|
|
||||||
dnl ==========================
|
dnl ==========================
|
||||||
dnl check required libraries
|
dnl check required libraries
|
||||||
|
|
|
@ -19,20 +19,15 @@ libstrongswan_la_LIBADD = -lgmp -lpthread
|
||||||
|
|
||||||
INCLUDES = -I$(top_srcdir)/src/libstrongswan
|
INCLUDES = -I$(top_srcdir)/src/libstrongswan
|
||||||
EXTRA_DIST = asn1/oid.txt asn1/oid.pl
|
EXTRA_DIST = asn1/oid.txt asn1/oid.pl
|
||||||
DISTCLEANFILES = asn1/oid.c asn1/oid.h
|
MAINTAINERCLEANFILES = asn1/oid.c asn1/oid.h
|
||||||
|
|
||||||
if USE_LEAK_DETECTIVE
|
if USE_LEAK_DETECTIVE
|
||||||
libstrongswan_la_LIBADD += -ldl
|
libstrongswan_la_LIBADD += -ldl
|
||||||
AM_CFLAGS = -DLEAK_DETECTIVE
|
AM_CFLAGS = -DLEAK_DETECTIVE
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
# TODO: get perl from ./configure
|
|
||||||
PERL=perl
|
|
||||||
|
|
||||||
asn1/oid.c : asn1/oid.txt asn1/oid.pl
|
asn1/oid.c : asn1/oid.txt asn1/oid.pl
|
||||||
cd asn1 && $(PERL) oid.pl
|
cd asn1 && $(PERL) oid.pl
|
||||||
|
|
||||||
asn1/oid.h : asn1/oid.txt asn1/oid.pl
|
asn1/oid.h : asn1/oid.txt asn1/oid.pl
|
||||||
cd asn1 && $(PERL) oid.pl
|
cd asn1 && $(PERL) oid.pl
|
||||||
|
|
||||||
|
|
|
@ -30,10 +30,7 @@ pluto_LDADD = $(top_srcdir)/src/libfreeswan/libfreeswan.a $(top_srcdir)/src/libc
|
||||||
_pluto_adns_LDADD = -lresolv $(top_srcdir)/src/libfreeswan/libfreeswan.a
|
_pluto_adns_LDADD = -lresolv $(top_srcdir)/src/libfreeswan/libfreeswan.a
|
||||||
dist_man_MANS = pluto.8 ipsec.secrets.5
|
dist_man_MANS = pluto.8 ipsec.secrets.5
|
||||||
EXTRA_DIST = oid.pl oid.txt
|
EXTRA_DIST = oid.pl oid.txt
|
||||||
DISTCLEANFILES = oid.c oid.h
|
MAINTAINERCLEANFILES = oid.c oid.h
|
||||||
|
|
||||||
# TODO: get perl from ./configure
|
|
||||||
PERL=perl
|
|
||||||
|
|
||||||
oid.c: oid.txt oid.pl
|
oid.c: oid.txt oid.pl
|
||||||
$(PERL) oid.pl
|
$(PERL) oid.pl
|
||||||
|
|
|
@ -10,14 +10,11 @@ AM_CFLAGS = -DIPSEC_DIR=\"${ipsecdir}\" -DIPSEC_CONFDIR=\"${confdir}\" -DIPSEC_P
|
||||||
starter_LDADD = loglite.o defs.o $(top_srcdir)/src/libfreeswan/libfreeswan.a
|
starter_LDADD = loglite.o defs.o $(top_srcdir)/src/libfreeswan/libfreeswan.a
|
||||||
EXTRA_DIST = parser.l parser.y keywords.txt ipsec.conf
|
EXTRA_DIST = parser.l parser.y keywords.txt ipsec.conf
|
||||||
dist_man_MANS = ipsec.conf.5
|
dist_man_MANS = ipsec.conf.5
|
||||||
DISTCLEANFILES = lex.yy.c y.tab.c y.tab.h keywords.c
|
MAINTAINERCLEANFILES = lex.yy.c y.tab.c y.tab.h keywords.c
|
||||||
|
|
||||||
PLUTODIR=$(top_srcdir)/src/pluto
|
PLUTODIR=$(top_srcdir)/src/pluto
|
||||||
OPENACDIR=$(top_srcdir)/src/openac
|
OPENACDIR=$(top_srcdir)/src/openac
|
||||||
|
|
||||||
# TODO: get gperf from ./configure
|
|
||||||
GPERF=gperf
|
|
||||||
|
|
||||||
lex.yy.c: y.tab.c parser.l parser.y parser.h
|
lex.yy.c: y.tab.c parser.l parser.y parser.h
|
||||||
$(LEX) parser.l
|
$(LEX) parser.l
|
||||||
|
|
||||||
|
@ -38,5 +35,3 @@ defs.o: $(PLUTODIR)/defs.c $(PLUTODIR)/defs.h
|
||||||
|
|
||||||
install-exec-local :
|
install-exec-local :
|
||||||
test -e "$(sysconfdir)/ipsec.conf" || $(INSTALL) ipsec.conf $(sysconfdir)/ipsec.conf
|
test -e "$(sysconfdir)/ipsec.conf" || $(INSTALL) ipsec.conf $(sysconfdir)/ipsec.conf
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue