diff --git a/c++/Makefile.in b/c++/Makefile.in index e661de816..08d1c2d28 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -98,7 +98,7 @@ hamlibdocdir = @hamlibdocdir@ install_sh = @install_sh@ lib_LTLIBRARIES = libhamlib++.la -libhamlib___la_SOURCES = rigclass.cc +libhamlib___la_SOURCES = rigclass.cc rotclass.cc libhamlib___la_LDFLAGS = -no-undefined -release @VERSION@ -version-info 0:0:0 libhamlib___la_LIBADD = ../src/libhamlib.la subdir = c++ @@ -108,7 +108,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) libhamlib___la_DEPENDENCIES = ../src/libhamlib.la -am_libhamlib___la_OBJECTS = rigclass.lo +am_libhamlib___la_OBJECTS = rigclass.lo rotclass.lo libhamlib___la_OBJECTS = $(am_libhamlib___la_OBJECTS) DEFS = @DEFS@ @@ -117,7 +117,7 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/depcomp -@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/rigclass.Plo +@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/rigclass.Plo $(DEPDIR)/rotclass.Plo CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ @@ -180,6 +180,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rigclass.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rotclass.Plo@am__quote@ distclean-depend: -rm -rf $(DEPDIR) diff --git a/include/Makefile.in b/include/Makefile.in index 0bc57242d..506df8f6f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -102,7 +102,7 @@ noinst_HEADERS = config.h # Should be nobase_include_HEADERS include_HEADERS = hamlib/rig.h hamlib/riglist.h hamlib/rig_dll.h \ - hamlib/rotator.h hamlib/rotlist.h hamlib/rigclass.h + hamlib/rotator.h hamlib/rotlist.h hamlib/rigclass.h hamlib/rotclass.h subdir = include mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/Makefile.in b/src/Makefile.in index 7d13e8745..efa21010a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -98,7 +98,7 @@ install_sh = @install_sh@ INCLUDES = @INCLUDES@ @INCLTDL@ RIGSRC = rig.c serial.c misc.c register.c event.c cal.c conf.c tones.c \ - rotator.c locator.c rot_reg.c rot_conf.c + rotator.c locator.c rot_reg.c rot_conf.c iofunc.c lib_LTLIBRARIES = libhamlib.la @@ -107,7 +107,9 @@ libhamlib_la_LDFLAGS = -no-undefined -release @VERSION@ -version-info 0:0:0 libhamlib_la_CFLAGS = -DIN_HAMLIB $(AM_CFLAGS) libhamlib_la_LIBADD = @LIBLTDL@ ../lib/libmisc.la -lm -noinst_HEADERS = event.h misc.h serial.h cal.h conf.h tones.h rot_conf.h +noinst_HEADERS = event.h misc.h serial.h iofunc.c cal.h tones.h \ + conf.h rot_conf.h + subdir = src mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h @@ -120,7 +122,7 @@ am_libhamlib_la_OBJECTS = libhamlib_la-rig.lo libhamlib_la-serial.lo \ libhamlib_la-event.lo libhamlib_la-cal.lo libhamlib_la-conf.lo \ libhamlib_la-tones.lo libhamlib_la-rotator.lo \ libhamlib_la-locator.lo libhamlib_la-rot_reg.lo \ - libhamlib_la-rot_conf.lo + libhamlib_la-rot_conf.lo libhamlib_la-iofunc.lo libhamlib_la_OBJECTS = $(am_libhamlib_la_OBJECTS) DEFS = @DEFS@ @@ -132,6 +134,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/libhamlib_la-cal.Plo \ @AMDEP_TRUE@ $(DEPDIR)/libhamlib_la-conf.Plo \ @AMDEP_TRUE@ $(DEPDIR)/libhamlib_la-event.Plo \ +@AMDEP_TRUE@ $(DEPDIR)/libhamlib_la-iofunc.Plo \ @AMDEP_TRUE@ $(DEPDIR)/libhamlib_la-locator.Plo \ @AMDEP_TRUE@ $(DEPDIR)/libhamlib_la-misc.Plo \ @AMDEP_TRUE@ $(DEPDIR)/libhamlib_la-register.Plo \ @@ -206,6 +209,7 @@ libhamlib_la-rotator.lo: rotator.c libhamlib_la-locator.lo: locator.c libhamlib_la-rot_reg.lo: rot_reg.c libhamlib_la-rot_conf.lo: rot_conf.c +libhamlib_la-iofunc.lo: iofunc.c libhamlib.la: $(libhamlib_la_OBJECTS) $(libhamlib_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libhamlib_la_LDFLAGS) $(libhamlib_la_OBJECTS) $(libhamlib_la_LIBADD) $(LIBS) @@ -218,6 +222,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libhamlib_la-cal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libhamlib_la-conf.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libhamlib_la-event.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libhamlib_la-iofunc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libhamlib_la-locator.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libhamlib_la-misc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libhamlib_la-register.Plo@am__quote@ @@ -464,6 +469,24 @@ libhamlib_la-rot_conf.lo: rot_conf.c @AMDEP_TRUE@ depfile='$(DEPDIR)/libhamlib_la-rot_conf.Plo' tmpdepfile='$(DEPDIR)/libhamlib_la-rot_conf.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhamlib_la_CFLAGS) $(CFLAGS) -c -o libhamlib_la-rot_conf.lo `test -f rot_conf.c || echo '$(srcdir)/'`rot_conf.c + +libhamlib_la-iofunc.o: iofunc.c +@AMDEP_TRUE@ source='iofunc.c' object='libhamlib_la-iofunc.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libhamlib_la-iofunc.Po' tmpdepfile='$(DEPDIR)/libhamlib_la-iofunc.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhamlib_la_CFLAGS) $(CFLAGS) -c -o libhamlib_la-iofunc.o `test -f iofunc.c || echo '$(srcdir)/'`iofunc.c + +libhamlib_la-iofunc.obj: iofunc.c +@AMDEP_TRUE@ source='iofunc.c' object='libhamlib_la-iofunc.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libhamlib_la-iofunc.Po' tmpdepfile='$(DEPDIR)/libhamlib_la-iofunc.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhamlib_la_CFLAGS) $(CFLAGS) -c -o libhamlib_la-iofunc.obj `cygpath -w iofunc.c` + +libhamlib_la-iofunc.lo: iofunc.c +@AMDEP_TRUE@ source='iofunc.c' object='libhamlib_la-iofunc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libhamlib_la-iofunc.Plo' tmpdepfile='$(DEPDIR)/libhamlib_la-iofunc.TPlo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhamlib_la_CFLAGS) $(CFLAGS) -c -o libhamlib_la-iofunc.lo `test -f iofunc.c || echo '$(srcdir)/'`iofunc.c CCDEPMODE = @CCDEPMODE@ uninstall-info-am: diff --git a/tests/Makefile.in b/tests/Makefile.in index 271bc9a46..38f7406b9 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -116,7 +116,7 @@ testrig_LDFLAGS = @BACKENDLNK@ testtrn_LDFLAGS = @BACKENDLNK@ testfreq_LDFLAGS = @BACKENDLNK@ rigctl_LDFLAGS = @BACKENDLNK@ -rotctl_LDFLAGS = @BACKENDLNK@ +rotctl_LDFLAGS = @ROT_BACKENDLNK@ # temporary hack testbcd_LDFLAGS = -dlpreopen self @@ -134,7 +134,7 @@ testrig_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ testtrn_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ listrigs_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ rigctl_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ -rotctl_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ +rotctl_DEPENDENCIES = $(DEPENDENCIES) @ROT_BACKENDEPS@ rigmatrix_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@ testcpp_DEPENDENCIES = ../c++/libhamlib++.la @BACKENDEPS@