From b148b4b60c8b6414272c30cb684cd4050e63af7f Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Wed, 29 Apr 2026 21:41:54 +0200 Subject: [PATCH] build utilities in source subdirectories and add ipxripd --- Makefile.am | 88 ++++++------------------------------------- configure.ac | 2 + ipxripd/Makefile | 91 +++++++++++++++++++++++++++++---------------- ipxripd/Makefile.am | 40 ++++++++++---------- ipxripd/Makefile.in | 89 +++++++++++++++++++++++++++++--------------- src/Makefile.am | 44 ++++++++++++++++++++++ tools/Makefile.am | 18 +++++++++ 7 files changed, 214 insertions(+), 158 deletions(-) create mode 100644 src/Makefile.am create mode 100644 tools/Makefile.am diff --git a/Makefile.am b/Makefile.am index 270c07b..1a8c9c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,80 +1,16 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = po ipxripd +SUBDIRS = po src tools ipxripd -AM_CFLAGS = -Wall -Wextra +EXTRA_DIST = \ + autogen.sh \ + scripts/config.ipx \ + scripts/init.ipx \ + Samples/ipxrcv.c \ + Samples/ipxsend.c \ + Samples/rip.c \ + Samples/sap.c \ + Samples/samples.h -sbin_PROGRAMS = \ - ipx_configure \ - ipx_interface \ - ipx_internal_net \ - ipx_route \ - ipx_cmd \ - ipx_dump \ - ipx_parse - -ipx_configure_SOURCES = \ - src/nls.h \ - src/ipx_configure.c - -ipx_interface_SOURCES = \ - src/nls.h \ - src/ipxutil.h \ - src/ipxutil.c \ - src/ipx_interface.c - -ipx_internal_net_SOURCES = \ - src/nls.h \ - src/ipxutil.h \ - src/ipxutil.c \ - src/ipx_internal_net.c - -ipx_route_SOURCES = \ - src/nls.h \ - src/ipxutil.h \ - src/ipxutil.c \ - src/ipx_route.c - -ipx_cmd_SOURCES = \ - src/nls.h \ - src/netlink.h \ - src/ipx_compat.h \ - src/ipx_cmd.c - -ipx_dump_SOURCES = \ - tools/nls.h \ - tools/ipxutil.h \ - tools/ipxutil.c \ - tools/ipxdump.c - -ipx_parse_SOURCES = \ - tools/nls.h \ - tools/ipxutil.h \ - tools/ipxutil.c \ - tools/ipxparse.c - -man_MANS = \ - docs/ipx_configure.8 \ - docs/ipx_interface.8 \ - docs/ipx_internal_net.8 \ - docs/ipx_route.8 \ - docs/ipx_cmd.8 \ - docs/ipx_dump.8 \ - docs/ipx_parse.8 - -samples_files = \ - Samples/ipxrcv.c \ - Samples/ipxsend.c \ - Samples/rip.c \ - Samples/sap.c \ - Samples/samples.h - -EXTRA_DIST = \ - $(man_MANS) \ - $(samples_files) \ - autogen.sh \ - scripts/config.ipx \ - scripts/init.ipx - -DISTCLEANFILES = \ - po/stamp-po +DISTCLEANFILES = \ + po/stamp-po diff --git a/configure.ac b/configure.ac index 78c7d52..8e8f6b1 100644 --- a/configure.ac +++ b/configure.ac @@ -17,6 +17,8 @@ AC_DEFINE_UNQUOTED([LOCALEDIR], ["${datadir}/locale"], [Define location of messa AC_CONFIG_FILES([ Makefile + src/Makefile + tools/Makefile ipxripd/Makefile po/Makefile.in ]) diff --git a/ipxripd/Makefile b/ipxripd/Makefile index 7f54bdf..d56565d 100644 --- a/ipxripd/Makefile +++ b/ipxripd/Makefile @@ -15,6 +15,7 @@ + am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ false; \ @@ -101,13 +102,14 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_sysconf_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" \ - "$(DESTDIR)$(man8dir)" + "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(sysconfdir)" PROGRAMS = $(sbin_PROGRAMS) am_ipxd_OBJECTS = ipxd.$(OBJEXT) ipxripd.$(OBJEXT) ipxsapd.$(OBJEXT) \ ipxsap.$(OBJEXT) ipxrip.$(OBJEXT) ipxkern.$(OBJEXT) \ @@ -183,6 +185,7 @@ man5dir = $(mandir)/man5 man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man5_MANS) $(man8_MANS) +DATA = $(dist_sysconf_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -315,35 +318,36 @@ runstatedir = ${localstatedir}/run sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com srcdir = . -sysconfdir = ${prefix}/etc +sysconfdir = /etc target_alias = top_build_prefix = ../ top_builddir = .. top_srcdir = .. +AM_CPPFLAGS = -I$(top_srcdir) AM_CFLAGS = -Wall -Wextra ipxd_SOURCES = \ - ipxd.c \ - ipxd.h \ - ipxripd.c \ - ipxripd.h \ - ipxsapd.c \ - ipxsapd.h \ - ipxsap.c \ - ipxsap.h \ - ipxrip.c \ - ipxrip.h \ - ipxkern.c \ - ipxkern.h \ - ipxutil.c \ + ipxd.c \ + ipxd.h \ + ipxripd.c \ + ipxripd.h \ + ipxsapd.c \ + ipxsapd.h \ + ipxsap.c \ + ipxsap.h \ + ipxrip.c \ + ipxrip.h \ + ipxkern.c \ + ipxkern.h \ + ipxutil.c \ ipxutil.h man8_MANS = ipxd.8 man5_MANS = ipx_ticks.5 +dist_sysconf_DATA = ipx_ticks EXTRA_DIST = \ - README \ - COPYING \ - ipxripd-0.7.lsm \ - ipx_ticks + README \ + COPYING \ + ipxripd-0.7.lsm all: all-am @@ -542,6 +546,27 @@ uninstall-man8: } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) +install-dist_sysconfDATA: $(dist_sysconf_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ + done + +uninstall-dist_sysconfDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -630,9 +655,9 @@ distdir-am: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(MANS) +all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ + for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(sysconfdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -699,7 +724,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-sbinPROGRAMS +install-exec-am: install-dist_sysconfDATA install-sbinPROGRAMS install-html: install-html-am @@ -744,7 +769,8 @@ ps: ps-am ps-am: -uninstall-am: uninstall-man uninstall-sbinPROGRAMS +uninstall-am: uninstall-dist_sysconfDATA uninstall-man \ + uninstall-sbinPROGRAMS uninstall-man: uninstall-man5 uninstall-man8 @@ -754,16 +780,17 @@ uninstall-man: uninstall-man5 uninstall-man8 clean-generic clean-sbinPROGRAMS cscopelist-am ctags ctags-am \ 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-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man5 install-man8 install-pdf install-pdf-am \ - install-ps install-ps-am install-sbinPROGRAMS install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + install-am install-data install-data-am \ + install-dist_sysconfDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-man5 \ + install-man8 install-pdf install-pdf-am install-ps \ + install-ps-am 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 tags-am uninstall \ - uninstall-am uninstall-man uninstall-man5 uninstall-man8 \ - uninstall-sbinPROGRAMS + uninstall-am uninstall-dist_sysconfDATA uninstall-man \ + uninstall-man5 uninstall-man8 uninstall-sbinPROGRAMS .PRECIOUS: Makefile diff --git a/ipxripd/Makefile.am b/ipxripd/Makefile.am index b9b9b20..69f589c 100644 --- a/ipxripd/Makefile.am +++ b/ipxripd/Makefile.am @@ -1,28 +1,30 @@ +AM_CPPFLAGS = -I$(top_srcdir) AM_CFLAGS = -Wall -Wextra sbin_PROGRAMS = ipxd -ipxd_SOURCES = \ - ipxd.c \ - ipxd.h \ - ipxripd.c \ - ipxripd.h \ - ipxsapd.c \ - ipxsapd.h \ - ipxsap.c \ - ipxsap.h \ - ipxrip.c \ - ipxrip.h \ - ipxkern.c \ - ipxkern.h \ - ipxutil.c \ +ipxd_SOURCES = \ + ipxd.c \ + ipxd.h \ + ipxripd.c \ + ipxripd.h \ + ipxsapd.c \ + ipxsapd.h \ + ipxsap.c \ + ipxsap.h \ + ipxrip.c \ + ipxrip.h \ + ipxkern.c \ + ipxkern.h \ + ipxutil.c \ ipxutil.h man8_MANS = ipxd.8 man5_MANS = ipx_ticks.5 -EXTRA_DIST = \ - README \ - COPYING \ - ipxripd-0.7.lsm \ - ipx_ticks +dist_sysconf_DATA = ipx_ticks + +EXTRA_DIST = \ + README \ + COPYING \ + ipxripd-0.7.lsm diff --git a/ipxripd/Makefile.in b/ipxripd/Makefile.in index c67309d..ba3c88a 100644 --- a/ipxripd/Makefile.in +++ b/ipxripd/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -101,13 +102,14 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_sysconf_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" \ - "$(DESTDIR)$(man8dir)" + "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(sysconfdir)" PROGRAMS = $(sbin_PROGRAMS) am_ipxd_OBJECTS = ipxd.$(OBJEXT) ipxripd.$(OBJEXT) ipxsapd.$(OBJEXT) \ ipxsap.$(OBJEXT) ipxrip.$(OBJEXT) ipxkern.$(OBJEXT) \ @@ -183,6 +185,7 @@ man5dir = $(mandir)/man5 man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man5_MANS) $(man8_MANS) +DATA = $(dist_sysconf_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -320,30 +323,31 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +AM_CPPFLAGS = -I$(top_srcdir) AM_CFLAGS = -Wall -Wextra ipxd_SOURCES = \ - ipxd.c \ - ipxd.h \ - ipxripd.c \ - ipxripd.h \ - ipxsapd.c \ - ipxsapd.h \ - ipxsap.c \ - ipxsap.h \ - ipxrip.c \ - ipxrip.h \ - ipxkern.c \ - ipxkern.h \ - ipxutil.c \ + ipxd.c \ + ipxd.h \ + ipxripd.c \ + ipxripd.h \ + ipxsapd.c \ + ipxsapd.h \ + ipxsap.c \ + ipxsap.h \ + ipxrip.c \ + ipxrip.h \ + ipxkern.c \ + ipxkern.h \ + ipxutil.c \ ipxutil.h man8_MANS = ipxd.8 man5_MANS = ipx_ticks.5 +dist_sysconf_DATA = ipx_ticks EXTRA_DIST = \ - README \ - COPYING \ - ipxripd-0.7.lsm \ - ipx_ticks + README \ + COPYING \ + ipxripd-0.7.lsm all: all-am @@ -542,6 +546,27 @@ uninstall-man8: } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) +install-dist_sysconfDATA: $(dist_sysconf_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ + done + +uninstall-dist_sysconfDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -630,9 +655,9 @@ distdir-am: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(MANS) +all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ + for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(sysconfdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -699,7 +724,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-sbinPROGRAMS +install-exec-am: install-dist_sysconfDATA install-sbinPROGRAMS install-html: install-html-am @@ -744,7 +769,8 @@ ps: ps-am ps-am: -uninstall-am: uninstall-man uninstall-sbinPROGRAMS +uninstall-am: uninstall-dist_sysconfDATA uninstall-man \ + uninstall-sbinPROGRAMS uninstall-man: uninstall-man5 uninstall-man8 @@ -754,16 +780,17 @@ uninstall-man: uninstall-man5 uninstall-man8 clean-generic clean-sbinPROGRAMS cscopelist-am ctags ctags-am \ 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-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man5 install-man8 install-pdf install-pdf-am \ - install-ps install-ps-am install-sbinPROGRAMS install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + install-am install-data install-data-am \ + install-dist_sysconfDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-man5 \ + install-man8 install-pdf install-pdf-am install-ps \ + install-ps-am 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 tags-am uninstall \ - uninstall-am uninstall-man uninstall-man5 uninstall-man8 \ - uninstall-sbinPROGRAMS + uninstall-am uninstall-dist_sysconfDATA uninstall-man \ + uninstall-man5 uninstall-man8 uninstall-sbinPROGRAMS .PRECIOUS: Makefile diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..02e5b98 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,44 @@ +AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -Wall -Wextra + +sbin_PROGRAMS = \ + ipx_configure \ + ipx_interface \ + ipx_internal_net \ + ipx_route \ + ipx_cmd + +ipx_configure_SOURCES = \ + nls.h \ + ipx_configure.c + +ipx_interface_SOURCES = \ + nls.h \ + ipxutil.h \ + ipxutil.c \ + ipx_interface.c + +ipx_internal_net_SOURCES = \ + nls.h \ + ipxutil.h \ + ipxutil.c \ + ipx_internal_net.c + +ipx_route_SOURCES = \ + nls.h \ + ipxutil.h \ + ipxutil.c \ + ipx_route.c + +ipx_cmd_SOURCES = \ + nls.h \ + netlink.h \ + ipx_compat.h \ + ipx_cmd.c + +man8_MANS = \ + $(top_srcdir)/docs/ipx_configure.8 \ + $(top_srcdir)/docs/ipx_interface.8 \ + $(top_srcdir)/docs/ipx_internal_net.8 \ + $(top_srcdir)/docs/ipx_route.8 \ + $(top_srcdir)/docs/ipx_cmd.8 diff --git a/tools/Makefile.am b/tools/Makefile.am new file mode 100644 index 0000000..84db96d --- /dev/null +++ b/tools/Makefile.am @@ -0,0 +1,18 @@ +AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = -Wall -Wextra + +sbin_PROGRAMS = \ + ipx_dump \ + ipx_parse + +ipx_dump_SOURCES = \ + ipxutil.c \ + ipxdump.c + +ipx_parse_SOURCES = \ + ipxutil.c \ + ipxparse.c + +man8_MANS = \ + $(top_srcdir)/docs/ipx_dump.8 \ + $(top_srcdir)/docs/ipx_parse.8