Commit 6ecda39c authored by Shane Kerr's avatar Shane Kerr

Build fixes. See RT ticket #16888 for more information.

parent 9f706d46
EXTRA_DIST = contrib/* contrib/ms2isc/* doc/* tests/DHCPv6/* tests/failover/*
#
# automake adds dependencies that we don't like, so we explicitly remove them
#
Makefile:
#
# We have a lot of files that we want shipped with the distribution.
#
EXTRA_DIST = contrib/3.0b1-lease-convert contrib/dhclient-tz-exithook.sh \
contrib/dhcp.spec contrib/sethostname.sh contrib/solaris.init \
contrib/ms2isc/Registry.pm contrib/ms2isc/ms2isc.pl \
contrib/ms2isc/readme.txt \
doc/IANA-arp-parameters doc/Makefile doc/References.html \
doc/References.txt doc/References.xml doc/api+protocol \
doc/ja_JP.eucJP/dhclient-script.8 doc/ja_JP.eucJP/dhclient.8 \
doc/ja_JP.eucJP/dhclient.conf.5 doc/ja_JP.eucJP/dhclient.leases.5 \
doc/ja_JP.eucJP/dhcp-eval.5 doc/ja_JP.eucJP/dhcp-options.5 \
tests/failover/dhcp-1.cf tests/failover/dhcp-2.cf \
tests/failover/new-failover \
tests/DHCPv6/000-badmsgtype.pl \
tests/DHCPv6/010-solicit-noclientid.pl \
tests/DHCPv6/011-solicit-serverid.pl \
tests/DHCPv6/020-advertise-mcast.pl \
tests/DHCPv6/030-request-noclientid.pl \
tests/DHCPv6/031-request-noserverid.pl \
tests/DHCPv6/032-request-badduid.pl \
tests/DHCPv6/110-information-request-ia_na.pl \
tests/DHCPv6/111-information-request-ia_ta.pl \
tests/DHCPv6/112-badduid.pl \
tests/DHCPv6/210-solicit-nohost.pl \
tests/DHCPv6/211-solicit-opt-in-na.pl \
tests/DHCPv6/212-solicit-opt-in-na-norapidcommit.pl \
tests/DHCPv6/280-release-nohost.pl \
tests/DHCPv6/281-release-bad-address.pl \
tests/DHCPv6/282-release-no-address.pl \
tests/DHCPv6/283-release.pl \
tests/DHCPv6/290-decline-nohost.pl \
tests/DHCPv6/291-decline-bad-address.pl \
tests/DHCPv6/292-decline-no-address.pl \
tests/DHCPv6/293-decline.pl \
tests/DHCPv6/README tests/DHCPv6/dhcp_client.pm \
tests/DHCPv6/stubcli-opt-in-na.pl tests/DHCPv6/stubcli.pl \
tests/DHCPv6/test-a.conf tests/DHCPv6/test-b.conf
SUBDIRS = includes common minires dst omapip client dhcpctl relay server
nobase_include_HEADERS = dhcpctl/dhcpctl.h
......@@ -99,6 +99,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
......@@ -122,8 +123,6 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
......@@ -135,24 +134,70 @@ bindir = @bindir@
build_alias = @build_alias@
byte_order = @byte_order@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
EXTRA_DIST = contrib/* contrib/ms2isc/* doc/* tests/DHCPv6/* tests/failover/*
#
# We have a lot of files that we want shipped with the distribution.
#
EXTRA_DIST = contrib/3.0b1-lease-convert contrib/dhclient-tz-exithook.sh \
contrib/dhcp.spec contrib/sethostname.sh contrib/solaris.init \
contrib/ms2isc/Registry.pm contrib/ms2isc/ms2isc.pl \
contrib/ms2isc/readme.txt \
doc/IANA-arp-parameters doc/Makefile doc/References.html \
doc/References.txt doc/References.xml doc/api+protocol \
doc/ja_JP.eucJP/dhclient-script.8 doc/ja_JP.eucJP/dhclient.8 \
doc/ja_JP.eucJP/dhclient.conf.5 doc/ja_JP.eucJP/dhclient.leases.5 \
doc/ja_JP.eucJP/dhcp-eval.5 doc/ja_JP.eucJP/dhcp-options.5 \
tests/failover/dhcp-1.cf tests/failover/dhcp-2.cf \
tests/failover/new-failover \
tests/DHCPv6/000-badmsgtype.pl \
tests/DHCPv6/010-solicit-noclientid.pl \
tests/DHCPv6/011-solicit-serverid.pl \
tests/DHCPv6/020-advertise-mcast.pl \
tests/DHCPv6/030-request-noclientid.pl \
tests/DHCPv6/031-request-noserverid.pl \
tests/DHCPv6/032-request-badduid.pl \
tests/DHCPv6/110-information-request-ia_na.pl \
tests/DHCPv6/111-information-request-ia_ta.pl \
tests/DHCPv6/112-badduid.pl \
tests/DHCPv6/210-solicit-nohost.pl \
tests/DHCPv6/211-solicit-opt-in-na.pl \
tests/DHCPv6/212-solicit-opt-in-na-norapidcommit.pl \
tests/DHCPv6/280-release-nohost.pl \
tests/DHCPv6/281-release-bad-address.pl \
tests/DHCPv6/282-release-no-address.pl \
tests/DHCPv6/283-release.pl \
tests/DHCPv6/290-decline-nohost.pl \
tests/DHCPv6/291-decline-bad-address.pl \
tests/DHCPv6/292-decline-no-address.pl \
tests/DHCPv6/293-decline.pl \
tests/DHCPv6/README tests/DHCPv6/dhcp_client.pm \
tests/DHCPv6/stubcli-opt-in-na.pl tests/DHCPv6/stubcli.pl \
tests/DHCPv6/test-a.conf tests/DHCPv6/test-b.conf
SUBDIRS = includes common minires dst omapip client dhcpctl relay server
nobase_include_HEADERS = dhcpctl/dhcpctl.h
all: all-recursive
......@@ -174,15 +219,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
cd $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
......@@ -347,7 +383,7 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
$(mkdir_p) $(distdir)/contrib $(distdir)/contrib/ms2isc $(distdir)/dhcpctl $(distdir)/doc $(distdir)/tests/DHCPv6 $(distdir)/tests/failover
$(mkdir_p) $(distdir)/contrib $(distdir)/contrib/ms2isc $(distdir)/dhcpctl $(distdir)/doc $(distdir)/doc/ja_JP.eucJP $(distdir)/tests/DHCPv6 $(distdir)/tests/failover
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
......@@ -584,6 +620,11 @@ uninstall-info: uninstall-info-recursive
pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-info-am uninstall-nobase_includeHEADERS
#
# automake adds dependencies that we don't like, so we explicitly remove them
#
Makefile:
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
sysconf_DATA = dhclient.conf
dist_sysconf_DATA = dhclient.conf
sbin_PROGRAMS = dhclient
dhclient_SOURCES = clparse.c dhclient.c dhc6.c
dhclient_LDADD = ../common/libdhcp.a ../minires/libres.a \
../omapip/libomapi.a ../dst/libdst.a
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
EXTRA_DIST = $(man_MANS)
dhclient.o: dhclient.c
$(COMPILE) -DCLIENT_PATH='"$(sbindir)"' \
......
......@@ -37,7 +37,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
sbin_PROGRAMS = dhclient$(EXEEXT)
subdir = client
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
DIST_COMMON = $(dist_sysconf_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
......@@ -73,8 +74,8 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
sysconfDATA_INSTALL = $(INSTALL_DATA)
DATA = $(sysconf_DATA)
dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_sysconf_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
......@@ -99,6 +100,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
......@@ -122,8 +124,6 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
......@@ -135,29 +135,37 @@ bindir = @bindir@
build_alias = @build_alias@
byte_order = @byte_order@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
sysconf_DATA = dhclient.conf
dist_sysconf_DATA = dhclient.conf
dhclient_SOURCES = clparse.c dhclient.c dhc6.c
dhclient_LDADD = ../common/libdhcp.a ../minires/libres.a \
../omapip/libomapi.a ../dst/libdst.a
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
EXTRA_DIST = $(man_MANS)
all: all-am
.SUFFIXES:
......@@ -332,19 +340,19 @@ uninstall-man8:
echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
done
install-sysconfDATA: $(sysconf_DATA)
install-dist_sysconfDATA: $(dist_sysconf_DATA)
@$(NORMAL_INSTALL)
test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
@list='$(sysconf_DATA)'; for p in $$list; do \
@list='$(dist_sysconf_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
$(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
$(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
done
uninstall-sysconfDATA:
uninstall-dist_sysconfDATA:
@$(NORMAL_UNINSTALL)
@list='$(sysconf_DATA)'; for p in $$list; do \
@list='$(dist_sysconf_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
......@@ -478,7 +486,7 @@ info-am:
install-data-am: install-man
install-exec-am: install-sbinPROGRAMS install-sysconfDATA
install-exec-am: install-dist_sysconfDATA install-sbinPROGRAMS
install-info: install-info-am
......@@ -503,8 +511,8 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-info-am uninstall-man uninstall-sbinPROGRAMS \
uninstall-sysconfDATA
uninstall-am: uninstall-dist_sysconfDATA uninstall-info-am \
uninstall-man uninstall-sbinPROGRAMS
uninstall-man: uninstall-man5 uninstall-man8
......@@ -512,14 +520,15 @@ uninstall-man: uninstall-man5 uninstall-man8
clean-sbinPROGRAMS ctags distclean distclean-compile \
distclean-generic distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-exec install-exec-am install-info \
install-info-am install-man install-man5 install-man8 \
install-sbinPROGRAMS install-strip install-sysconfDATA \
install-data-am install-dist_sysconfDATA install-exec \
install-exec-am install-info install-info-am install-man \
install-man5 install-man8 install-sbinPROGRAMS install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-info-am uninstall-man uninstall-man5 \
uninstall-man8 uninstall-sbinPROGRAMS uninstall-sysconfDATA
uninstall-am uninstall-dist_sysconfDATA uninstall-info-am \
uninstall-man uninstall-man5 uninstall-man8 \
uninstall-sbinPROGRAMS
dhclient.o: dhclient.c
......
AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
EXTRA_DIST = dhclient.conf
noinst_LIBRARIES = libdhcp.a
libdhcp_a_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c \
dispatch.c dlpi.c dns.c ethernet.c execute.c fddi.c \
......@@ -8,4 +7,5 @@ libdhcp_a_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c \
parse.c print.c raw.c resolv.c socket.c tables.c tr.c \
tree.c upf.c heap.c
man_MANS = dhcp-eval.5 dhcp-options.5
EXTRA_DIST = $(man_MANS)
......@@ -95,6 +95,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
......@@ -118,8 +119,6 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
......@@ -131,25 +130,31 @@ bindir = @bindir@
build_alias = @build_alias@
byte_order = @byte_order@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
EXTRA_DIST = dhclient.conf
noinst_LIBRARIES = libdhcp.a
libdhcp_a_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c \
dispatch.c dlpi.c dns.c ethernet.c execute.c fddi.c \
......@@ -158,6 +163,7 @@ libdhcp_a_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c \
tree.c upf.c heap.c
man_MANS = dhcp-eval.5 dhcp-options.5
EXTRA_DIST = $(man_MANS)
all: all-am
.SUFFIXES:
......
This diff is collapsed.
......@@ -101,7 +101,7 @@ AC_CHECK_SIZEOF(struct iaddr *, , [
#include <stdio.h>
])
AC_OUTPUT(
AC_OUTPUT([
Makefile
client/Makefile
common/Makefile
......@@ -112,5 +112,5 @@ AC_OUTPUT(
omapip/Makefile
relay/Makefile
server/Makefile
)
])
......@@ -2,6 +2,7 @@ bin_PROGRAMS = omshell
lib_LIBRARIES = libdhcpctl.a
noinst_PROGRAMS = cltest
man_MANS = omshell.1 dhcpctl.3
EXTRA_DIST = $(man_MANS)
omshell_SOURCES = omshell.c
omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../minires/libres.a \
......
......@@ -111,6 +111,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
......@@ -134,8 +135,6 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
......@@ -147,25 +146,33 @@ bindir = @bindir@
build_alias = @build_alias@
byte_order = @byte_order@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
lib_LIBRARIES = libdhcpctl.a
man_MANS = omshell.1 dhcpctl.3
EXTRA_DIST = $(man_MANS)
omshell_SOURCES = omshell.c
omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../minires/libres.a \
../omapip/libomapi.a ../dst/libdst.a
......
......@@ -5,3 +5,4 @@ lib_LIBRARIES = libdst.a
libdst_a_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \
base64.c prandom.c
EXTRA_DIST = dst_internal.h md5.h md5_locl.h
......@@ -93,6 +93,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
......@@ -116,8 +117,6 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
......@@ -129,19 +128,26 @@ bindir = @bindir@
build_alias = @build_alias@
byte_order = @byte_order@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
......@@ -151,6 +157,7 @@ lib_LIBRARIES = libdst.a
libdst_a_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \
base64.c prandom.c
EXTRA_DIST = dst_internal.h md5.h md5_locl.h
all: all-am
.SUFFIXES:
......
nobase_include_HEADERS = omapip/*.h isc-dhcp/*.h
EXTRA_DIST = *.h apra/*.h minires/*.h netinet/*.h
nobase_include_HEADERS = omapip/alloc.h omapip/buffer.h omapip/convert.h \
omapip/hash.h omapip/omapip.h omapip/omapip_p.h \
omapip/trace.h \
isc-dhcp/boolean.h isc-dhcp/dst.h isc-dhcp/int.h \
isc-dhcp/lang.h isc-dhcp/list.h isc-dhcp/result.h \
isc-dhcp/types.h
EXTRA_DIST = cdefs.h ctrace.h dhcp.h dhcp6.h dhcpd.h dhctoken.h failover.h \
heap.h inet.h osdep.h site.h statement.h tree.h \
arpa/nameser.h arpa/nameser_compat.h \
minires/minires.h minires/res_update.h minires/resolv.h \
netinet/if_ether.h netinet/ip.h netinet/ip_icmp.h netinet/udp.h
......@@ -79,6 +79,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
......@@ -102,8 +103,6 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
......@@ -115,25 +114,43 @@ bindir = @bindir@
build_alias = @build_alias@
byte_order = @byte_order@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
nobase_include_HEADERS = omapip/*.h isc-dhcp/*.h
EXTRA_DIST = *.h apra/*.h minires/*.h netinet/*.h
nobase_include_HEADERS = omapip/alloc.h omapip/buffer.h omapip/convert.h \
omapip/hash.h omapip/omapip.h omapip/omapip_p.h \
omapip/trace.h \
isc-dhcp/boolean.h isc-dhcp/dst.h isc-dhcp/int.h \
isc-dhcp/lang.h isc-dhcp/list.h isc-dhcp/result.h \
isc-dhcp/types.h
EXTRA_DIST = cdefs.h ctrace.h dhcp.h dhcp6.h dhcpd.h dhctoken.h failover.h \
heap.h inet.h osdep.h site.h statement.h tree.h \
arpa/nameser.h arpa/nameser_compat.h \
minires/minires.h minires/res_update.h minires/resolv.h \
netinet/if_ether.h netinet/ip.h netinet/ip_icmp.h netinet/udp.h
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
......@@ -254,7 +271,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
$(mkdir_p) $(distdir)/apra $(distdir)/isc-dhcp $(distdir)/minires $(distdir)/netinet $(distdir)/omapip
$(mkdir_p) $(distdir)/arpa $(distdir)/isc-dhcp $(distdir)/minires $(distdir)/netinet $(distdir)/omapip
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
......
......@@ -64,7 +64,7 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* The size of a `struct iaddr *', as computed by sizeof. */
/* The size of `struct iaddr *', as computed by sizeof. */
#undef SIZEOF_STRUCT_IADDR_P
/* Define to 1 if you have the ANSI C header files. */
......
......@@ -88,6 +88,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
......@@ -111,8 +112,6 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
......@@ -124,19 +123,26 @@ bindir = @bindir@
build_alias = @build_alias@
byte_order = @byte_order@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
......
......@@ -6,6 +6,7 @@ libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
handle.c message.c convert.c hash.c auth.c inet_addr.c \
array.c trace.c mrtrace.c toisc.c iscprint.c
man_MANS = omapi.3
EXTRA_DIST = $(man_MANS)