From edb4fb69fe34a5e855f2f9899151dbf5d36b4d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Fillod=2C=20F8CFE?= Date: Mon, 4 Jun 2001 21:24:58 +0000 Subject: [PATCH] added alinco subdir git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@531 7ae35d74-ebe9-4afe-98af-79ac388436b8 --- Makefile.am | 2 +- Makefile.in | 48 +++++++++--------------------------------------- configure | 4 +++- configure.in | 3 ++- 4 files changed, 15 insertions(+), 42 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2b3f2c8da..dc79b5084 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ EXTRA_DIST = PLAN TODO LICENSE -SUBDIRS = include lib libltdl src icom kenwood aor yaesu dummy pcr winradio tests doc +SUBDIRS = include lib libltdl src icom kenwood aor yaesu dummy pcr alinco winradio tests doc INCLUDES = $(INCLTDL) hamlibdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE diff --git a/Makefile.in b/Makefile.in index c001e8688..602ef9d22 100644 --- a/Makefile.in +++ b/Makefile.in @@ -90,7 +90,7 @@ WINRADIOLNK = @WINRADIOLNK@ hamlibdocdir = @hamlibdocdir@ EXTRA_DIST = PLAN TODO LICENSE -SUBDIRS = include lib libltdl src icom kenwood aor yaesu dummy pcr winradio tests doc +SUBDIRS = include lib libltdl src icom kenwood aor yaesu dummy pcr alinco winradio tests doc INCLUDES = $(INCLTDL) hamlibdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE @@ -102,8 +102,7 @@ DATA = $(hamlibdoc_DATA) DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ Makefile.in NEWS THANKS TODO aclocal.m4 config.guess config.sub \ -configure configure.in include/config.h.in include/stamp-h.in \ -install-sh ltmain.sh missing mkinstalldirs +configure configure.in install-sh ltmain.sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -127,34 +126,6 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -include/config.h: include/stamp-h - @if test ! -f $@; then \ - rm -f include/stamp-h; \ - $(MAKE) include/stamp-h; \ - else :; fi -include/stamp-h: $(srcdir)/include/config.h.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=include/config.h \ - $(SHELL) ./config.status - @echo timestamp > include/stamp-h 2> /dev/null -$(srcdir)/include/config.h.in: $(srcdir)/include/stamp-h.in - @if test ! -f $@; then \ - rm -f $(srcdir)/include/stamp-h.in; \ - $(MAKE) $(srcdir)/include/stamp-h.in; \ - else :; fi -$(srcdir)/include/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/include/stamp-h.in 2> /dev/null - -mostlyclean-hdr: - -clean-hdr: - -distclean-hdr: - -rm -f include/config.h - -maintainer-clean-hdr: - install-hamlibdocDATA: $(hamlibdoc_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(hamlibdocdir) @@ -363,31 +334,30 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic +mostlyclean-am: mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-hdr clean-tags clean-generic mostlyclean-am +clean-am: clean-tags clean-generic mostlyclean-am clean: clean-recursive -distclean-am: distclean-hdr distclean-tags distclean-generic clean-am +distclean-am: distclean-tags distclean-generic clean-am -rm -f libtool distclean: distclean-recursive -rm -f config.status -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ - maintainer-clean-generic distclean-am +maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive -rm -f config.status -.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ -uninstall-hamlibdocDATA install-hamlibdocDATA install-data-recursive \ -uninstall-data-recursive install-exec-recursive \ +.PHONY: uninstall-hamlibdocDATA install-hamlibdocDATA \ +install-data-recursive uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ diff --git a/configure b/configure index 976ac3ed3..233fd1e5f 100755 --- a/configure +++ b/configure @@ -1883,7 +1883,7 @@ OBJEXT=$ac_cv_objext ac_objext=$ac_cv_objext -INCLUDES="${INCLUDES} -I\$(top_srcdir)/src" +INCLUDES="${INCLUDES} -I\$(top_srcdir)/include -I\$(top_srcdir)/src" CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" if test "${ac_cv_prog_gcc}" = "yes"; then CFLAGS="${CFLAGS} -Wall" @@ -6736,6 +6736,7 @@ aor/Makefile kenwood/Makefile winradio/Makefile pcr/Makefile +alinco/Makefile src/Makefile tests/Makefile doc/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 @@ -6875,6 +6876,7 @@ aor/Makefile kenwood/Makefile winradio/Makefile pcr/Makefile +alinco/Makefile src/Makefile tests/Makefile doc/Makefile"} diff --git a/configure.in b/configure.in index 02f410b65..a69d876ff 100644 --- a/configure.in +++ b/configure.in @@ -36,7 +36,7 @@ AC_MINGW32 AC_EXEEXT AC_OBJEXT -INCLUDES="${INCLUDES} -I\$(top_srcdir)/src" +INCLUDES="${INCLUDES} -I\$(top_srcdir)/include -I\$(top_srcdir)/src" CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" if test "${ac_cv_prog_gcc}" = "yes"; then CFLAGS="${CFLAGS} -Wall" @@ -186,6 +186,7 @@ aor/Makefile kenwood/Makefile winradio/Makefile pcr/Makefile +alinco/Makefile src/Makefile tests/Makefile doc/Makefile])