diff --git a/configure b/configure
index 67304b6f3..096538ab3 100755
--- a/configure
+++ b/configure
@@ -9884,8 +9884,8 @@ if test "${ac_cv_header_rpc_rpc_h}" = "yes" ; then
  BACKEND_LIST="$BACKEND_LIST rpcrig"
 fi
 
-# Preopen self for static version
-BACKENDLNK="-dlpreopen self"
+# dlopen force or preopen self for static version ?
+BACKENDLNK="-dlopen force"
 for be in ${BACKEND_LIST} ; do
 	BACKENDLNK="${BACKENDLNK} -dlopen ../${be}/libhamlib-${be}.la"
 	BACKENDEPS="${BACKENDEPS} ../${be}/libhamlib-${be}.la"
diff --git a/include/Makefile.in b/include/Makefile.in
index dc9ea7314..dcbc10423 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -99,7 +99,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/rigclass.h
+		hamlib/rotator.h hamlib/rotlist.h hamlib/rigclass.h
 
 subdir = include
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/rpcrig/rpcrig.h b/rpcrig/rpcrig.h
index fcbf81a49..b4dae8c8a 100644
--- a/rpcrig/rpcrig.h
+++ b/rpcrig/rpcrig.h
@@ -17,7 +17,7 @@ extern "C" {
  *  Hamlib Interface - RPC definitions
  *  Copyright (c) 2000,2001 by Stephane Fillod and Frank Singleton
  *
- *		$Id: rpcrig.h,v 1.2 2001-12-26 23:42:20 fillods Exp $
+ *		$Id: rpcrig.h,v 1.3 2001-12-27 21:59:10 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -35,6 +35,7 @@ extern "C" {
  *
  */
 #include <rpc/xdr.h>
+#include <hamlib/rig.h>
 
 typedef u_int model_x;
 
@@ -58,6 +59,10 @@ typedef long shortfreq_x;
 
 typedef uint64_t setting_x;
 
+typedef long ant_x;
+
+typedef long ann_x;
+
 struct mode_s {
 	rmode_x mode;
 	pbwidth_x width;
@@ -163,14 +168,55 @@ struct vfo_op_arg {
 };
 typedef struct vfo_op_arg vfo_op_arg;
 
+struct freq_range_s {
+	freq_x start;
+	freq_x end;
+	rmode_x modes;
+	int low_power;
+	int high_power;
+	vfo_x vfo;
+	ant_x ant;
+};
+typedef struct freq_range_s freq_range_s;
+
+struct tuning_step_s {
+	rmode_x modes;
+	shortfreq_x ts;
+};
+typedef struct tuning_step_s tuning_step_s;
+
+struct filter_s {
+	rmode_x modes;
+	pbwidth_x width;
+};
+typedef struct filter_s filter_s;
+
+struct chan_s {
+	int start;
+	int end;
+	u_int type;
+};
+typedef struct chan_s chan_s;
+
 struct rigstate_s {
 	int itu_region;
+	shortfreq_x max_rit;
+	shortfreq_x max_xit;
+	shortfreq_x max_ifshift;
+	ann_x announces;
 	setting_x has_get_func;
 	setting_x has_set_func;
 	setting_x has_get_level;
 	setting_x has_set_level;
 	setting_x has_get_parm;
 	setting_x has_set_parm;
+	int preamp[MAXDBLSTSIZ];
+	int attenuator[MAXDBLSTSIZ];
+	freq_range_s rx_range_list[FRQRANGESIZ];
+	freq_range_s tx_range_list[FRQRANGESIZ];
+	tuning_step_s tuning_steps[TSLSTSIZ];
+	filter_s filters[FLTLSTSIZ];
+	chan_s chan_list[CHANLSTSIZ];
 };
 typedef struct rigstate_s rigstate_s;
 
@@ -182,8 +228,6 @@ struct rigstate_res {
 };
 typedef struct rigstate_res rigstate_res;
 
-#include <hamlib/rig.h>
-
 #define freq_t2x(t, x) do { *(x) = (t); } while(0)
 #define freq_x2t(x) ((freq_t)*(x))
 
@@ -369,6 +413,8 @@ extern  bool_t xdr_dcd_x (XDR *, dcd_x*);
 extern  bool_t xdr_vfo_op_x (XDR *, vfo_op_x*);
 extern  bool_t xdr_shortfreq_x (XDR *, shortfreq_x*);
 extern  bool_t xdr_setting_x (XDR *, setting_x*);
+extern  bool_t xdr_ant_x (XDR *, ant_x*);
+extern  bool_t xdr_ann_x (XDR *, ann_x*);
 extern  bool_t xdr_mode_s (XDR *, mode_s*);
 extern  bool_t xdr_value_s (XDR *, value_s*);
 extern  bool_t xdr_freq_arg (XDR *, freq_arg*);
@@ -384,6 +430,10 @@ extern  bool_t xdr_dcd_res (XDR *, dcd_res*);
 extern  bool_t xdr_setting_arg (XDR *, setting_arg*);
 extern  bool_t xdr_val_res (XDR *, val_res*);
 extern  bool_t xdr_vfo_op_arg (XDR *, vfo_op_arg*);
+extern  bool_t xdr_freq_range_s (XDR *, freq_range_s*);
+extern  bool_t xdr_tuning_step_s (XDR *, tuning_step_s*);
+extern  bool_t xdr_filter_s (XDR *, filter_s*);
+extern  bool_t xdr_chan_s (XDR *, chan_s*);
 extern  bool_t xdr_rigstate_s (XDR *, rigstate_s*);
 extern  bool_t xdr_rigstate_res (XDR *, rigstate_res*);
 
@@ -399,6 +449,8 @@ extern bool_t xdr_dcd_x ();
 extern bool_t xdr_vfo_op_x ();
 extern bool_t xdr_shortfreq_x ();
 extern bool_t xdr_setting_x ();
+extern bool_t xdr_ant_x ();
+extern bool_t xdr_ann_x ();
 extern bool_t xdr_mode_s ();
 extern bool_t xdr_value_s ();
 extern bool_t xdr_freq_arg ();
@@ -414,6 +466,10 @@ extern bool_t xdr_dcd_res ();
 extern bool_t xdr_setting_arg ();
 extern bool_t xdr_val_res ();
 extern bool_t xdr_vfo_op_arg ();
+extern bool_t xdr_freq_range_s ();
+extern bool_t xdr_tuning_step_s ();
+extern bool_t xdr_filter_s ();
+extern bool_t xdr_chan_s ();
 extern bool_t xdr_rigstate_s ();
 extern bool_t xdr_rigstate_res ();
 
diff --git a/rpcrig/rpcrig_clnt.c b/rpcrig/rpcrig_clnt.c
index c1baacc1d..54746d363 100644
--- a/rpcrig/rpcrig_clnt.c
+++ b/rpcrig/rpcrig_clnt.c
@@ -9,7 +9,7 @@
  *  Hamlib Interface - RPC definitions
  *  Copyright (c) 2000,2001 by Stephane Fillod and Frank Singleton
  *
- *		$Id: rpcrig_clnt.c,v 1.2 2001-12-26 23:44:09 fillods Exp $
+ *		$Id: rpcrig_clnt.c,v 1.3 2001-12-27 21:58:47 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
diff --git a/rpcrig/rpcrig_svc.c b/rpcrig/rpcrig_svc.c
index cf277122d..c44c75863 100644
--- a/rpcrig/rpcrig_svc.c
+++ b/rpcrig/rpcrig_svc.c
@@ -19,7 +19,7 @@
  *  Hamlib Interface - RPC definitions
  *  Copyright (c) 2000,2001 by Stephane Fillod and Frank Singleton
  *
- *		$Id: rpcrig_svc.c,v 1.2 2001-12-26 23:44:09 fillods Exp $
+ *		$Id: rpcrig_svc.c,v 1.3 2001-12-27 21:58:47 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
diff --git a/rpcrig/rpcrig_xdr.c b/rpcrig/rpcrig_xdr.c
index 76b707bfd..c895075ef 100644
--- a/rpcrig/rpcrig_xdr.c
+++ b/rpcrig/rpcrig_xdr.c
@@ -8,7 +8,7 @@
  *  Hamlib Interface - RPC definitions
  *  Copyright (c) 2000,2001 by Stephane Fillod and Frank Singleton
  *
- *		$Id: rpcrig_xdr.c,v 1.2 2001-12-26 23:44:09 fillods Exp $
+ *		$Id: rpcrig_xdr.c,v 1.3 2001-12-27 21:58:47 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -136,6 +136,26 @@ xdr_setting_x (XDR *xdrs, setting_x *objp)
 	return TRUE;
 }
 
+bool_t
+xdr_ant_x (XDR *xdrs, ant_x *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_long (xdrs, objp))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_ann_x (XDR *xdrs, ann_x *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_long (xdrs, objp))
+		 return FALSE;
+	return TRUE;
+}
+
 bool_t
 xdr_mode_s (XDR *xdrs, mode_s *objp)
 {
@@ -360,13 +380,217 @@ xdr_vfo_op_arg (XDR *xdrs, vfo_op_arg *objp)
 	return TRUE;
 }
 
+bool_t
+xdr_freq_range_s (XDR *xdrs, freq_range_s *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_freq_x (xdrs, &objp->start))
+		 return FALSE;
+	 if (!xdr_freq_x (xdrs, &objp->end))
+		 return FALSE;
+	 if (!xdr_rmode_x (xdrs, &objp->modes))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->low_power))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->high_power))
+		 return FALSE;
+	 if (!xdr_vfo_x (xdrs, &objp->vfo))
+		 return FALSE;
+	 if (!xdr_ant_x (xdrs, &objp->ant))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_tuning_step_s (XDR *xdrs, tuning_step_s *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_rmode_x (xdrs, &objp->modes))
+		 return FALSE;
+	 if (!xdr_shortfreq_x (xdrs, &objp->ts))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_filter_s (XDR *xdrs, filter_s *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_rmode_x (xdrs, &objp->modes))
+		 return FALSE;
+	 if (!xdr_pbwidth_x (xdrs, &objp->width))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_chan_s (XDR *xdrs, chan_s *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_int (xdrs, &objp->start))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->end))
+		 return FALSE;
+	 if (!xdr_u_int (xdrs, &objp->type))
+		 return FALSE;
+	return TRUE;
+}
+
 bool_t
 xdr_rigstate_s (XDR *xdrs, rigstate_s *objp)
 {
 	register int32_t *buf;
 
+	int i;
+
+	if (xdrs->x_op == XDR_ENCODE) {
+		 if (!xdr_int (xdrs, &objp->itu_region))
+			 return FALSE;
+		 if (!xdr_shortfreq_x (xdrs, &objp->max_rit))
+			 return FALSE;
+		 if (!xdr_shortfreq_x (xdrs, &objp->max_xit))
+			 return FALSE;
+		 if (!xdr_shortfreq_x (xdrs, &objp->max_ifshift))
+			 return FALSE;
+		 if (!xdr_ann_x (xdrs, &objp->announces))
+			 return FALSE;
+		 if (!xdr_setting_x (xdrs, &objp->has_get_func))
+			 return FALSE;
+		 if (!xdr_setting_x (xdrs, &objp->has_set_func))
+			 return FALSE;
+		 if (!xdr_setting_x (xdrs, &objp->has_get_level))
+			 return FALSE;
+		 if (!xdr_setting_x (xdrs, &objp->has_set_level))
+			 return FALSE;
+		 if (!xdr_setting_x (xdrs, &objp->has_get_parm))
+			 return FALSE;
+		 if (!xdr_setting_x (xdrs, &objp->has_set_parm))
+			 return FALSE;
+		buf = XDR_INLINE (xdrs, ( MAXDBLSTSIZ  + MAXDBLSTSIZ ) * BYTES_PER_XDR_UNIT);
+		if (buf == NULL) {
+			 if (!xdr_vector (xdrs, (char *)objp->preamp, MAXDBLSTSIZ,
+				sizeof (int), (xdrproc_t) xdr_int))
+				 return FALSE;
+			 if (!xdr_vector (xdrs, (char *)objp->attenuator, MAXDBLSTSIZ,
+				sizeof (int), (xdrproc_t) xdr_int))
+				 return FALSE;
+
+		} else {
+		{
+			register int *genp;
+
+			for (i = 0, genp = objp->preamp;
+				i < MAXDBLSTSIZ; ++i) {
+				IXDR_PUT_LONG(buf, *genp++);
+			}
+		}
+		{
+			register int *genp;
+
+			for (i = 0, genp = objp->attenuator;
+				i < MAXDBLSTSIZ; ++i) {
+				IXDR_PUT_LONG(buf, *genp++);
+			}
+		}
+		}
+		 if (!xdr_vector (xdrs, (char *)objp->rx_range_list, FRQRANGESIZ,
+			sizeof (freq_range_s), (xdrproc_t) xdr_freq_range_s))
+			 return FALSE;
+		 if (!xdr_vector (xdrs, (char *)objp->tx_range_list, FRQRANGESIZ,
+			sizeof (freq_range_s), (xdrproc_t) xdr_freq_range_s))
+			 return FALSE;
+		 if (!xdr_vector (xdrs, (char *)objp->tuning_steps, TSLSTSIZ,
+			sizeof (tuning_step_s), (xdrproc_t) xdr_tuning_step_s))
+			 return FALSE;
+		 if (!xdr_vector (xdrs, (char *)objp->filters, FLTLSTSIZ,
+			sizeof (filter_s), (xdrproc_t) xdr_filter_s))
+			 return FALSE;
+		 if (!xdr_vector (xdrs, (char *)objp->chan_list, CHANLSTSIZ,
+			sizeof (chan_s), (xdrproc_t) xdr_chan_s))
+			 return FALSE;
+		return TRUE;
+	} else if (xdrs->x_op == XDR_DECODE) {
+		 if (!xdr_int (xdrs, &objp->itu_region))
+			 return FALSE;
+		 if (!xdr_shortfreq_x (xdrs, &objp->max_rit))
+			 return FALSE;
+		 if (!xdr_shortfreq_x (xdrs, &objp->max_xit))
+			 return FALSE;
+		 if (!xdr_shortfreq_x (xdrs, &objp->max_ifshift))
+			 return FALSE;
+		 if (!xdr_ann_x (xdrs, &objp->announces))
+			 return FALSE;
+		 if (!xdr_setting_x (xdrs, &objp->has_get_func))
+			 return FALSE;
+		 if (!xdr_setting_x (xdrs, &objp->has_set_func))
+			 return FALSE;
+		 if (!xdr_setting_x (xdrs, &objp->has_get_level))
+			 return FALSE;
+		 if (!xdr_setting_x (xdrs, &objp->has_set_level))
+			 return FALSE;
+		 if (!xdr_setting_x (xdrs, &objp->has_get_parm))
+			 return FALSE;
+		 if (!xdr_setting_x (xdrs, &objp->has_set_parm))
+			 return FALSE;
+		buf = XDR_INLINE (xdrs, ( MAXDBLSTSIZ  + MAXDBLSTSIZ ) * BYTES_PER_XDR_UNIT);
+		if (buf == NULL) {
+			 if (!xdr_vector (xdrs, (char *)objp->preamp, MAXDBLSTSIZ,
+				sizeof (int), (xdrproc_t) xdr_int))
+				 return FALSE;
+			 if (!xdr_vector (xdrs, (char *)objp->attenuator, MAXDBLSTSIZ,
+				sizeof (int), (xdrproc_t) xdr_int))
+				 return FALSE;
+
+		} else {
+		{
+			register int *genp;
+
+			for (i = 0, genp = objp->preamp;
+				i < MAXDBLSTSIZ; ++i) {
+				*genp++ = IXDR_GET_LONG(buf);
+			}
+		}
+		{
+			register int *genp;
+
+			for (i = 0, genp = objp->attenuator;
+				i < MAXDBLSTSIZ; ++i) {
+				*genp++ = IXDR_GET_LONG(buf);
+			}
+		}
+		}
+		 if (!xdr_vector (xdrs, (char *)objp->rx_range_list, FRQRANGESIZ,
+			sizeof (freq_range_s), (xdrproc_t) xdr_freq_range_s))
+			 return FALSE;
+		 if (!xdr_vector (xdrs, (char *)objp->tx_range_list, FRQRANGESIZ,
+			sizeof (freq_range_s), (xdrproc_t) xdr_freq_range_s))
+			 return FALSE;
+		 if (!xdr_vector (xdrs, (char *)objp->tuning_steps, TSLSTSIZ,
+			sizeof (tuning_step_s), (xdrproc_t) xdr_tuning_step_s))
+			 return FALSE;
+		 if (!xdr_vector (xdrs, (char *)objp->filters, FLTLSTSIZ,
+			sizeof (filter_s), (xdrproc_t) xdr_filter_s))
+			 return FALSE;
+		 if (!xdr_vector (xdrs, (char *)objp->chan_list, CHANLSTSIZ,
+			sizeof (chan_s), (xdrproc_t) xdr_chan_s))
+			 return FALSE;
+	 return TRUE;
+	}
+
 	 if (!xdr_int (xdrs, &objp->itu_region))
 		 return FALSE;
+	 if (!xdr_shortfreq_x (xdrs, &objp->max_rit))
+		 return FALSE;
+	 if (!xdr_shortfreq_x (xdrs, &objp->max_xit))
+		 return FALSE;
+	 if (!xdr_shortfreq_x (xdrs, &objp->max_ifshift))
+		 return FALSE;
+	 if (!xdr_ann_x (xdrs, &objp->announces))
+		 return FALSE;
 	 if (!xdr_setting_x (xdrs, &objp->has_get_func))
 		 return FALSE;
 	 if (!xdr_setting_x (xdrs, &objp->has_set_func))
@@ -379,6 +603,27 @@ xdr_rigstate_s (XDR *xdrs, rigstate_s *objp)
 		 return FALSE;
 	 if (!xdr_setting_x (xdrs, &objp->has_set_parm))
 		 return FALSE;
+	 if (!xdr_vector (xdrs, (char *)objp->preamp, MAXDBLSTSIZ,
+		sizeof (int), (xdrproc_t) xdr_int))
+		 return FALSE;
+	 if (!xdr_vector (xdrs, (char *)objp->attenuator, MAXDBLSTSIZ,
+		sizeof (int), (xdrproc_t) xdr_int))
+		 return FALSE;
+	 if (!xdr_vector (xdrs, (char *)objp->rx_range_list, FRQRANGESIZ,
+		sizeof (freq_range_s), (xdrproc_t) xdr_freq_range_s))
+		 return FALSE;
+	 if (!xdr_vector (xdrs, (char *)objp->tx_range_list, FRQRANGESIZ,
+		sizeof (freq_range_s), (xdrproc_t) xdr_freq_range_s))
+		 return FALSE;
+	 if (!xdr_vector (xdrs, (char *)objp->tuning_steps, TSLSTSIZ,
+		sizeof (tuning_step_s), (xdrproc_t) xdr_tuning_step_s))
+		 return FALSE;
+	 if (!xdr_vector (xdrs, (char *)objp->filters, FLTLSTSIZ,
+		sizeof (filter_s), (xdrproc_t) xdr_filter_s))
+		 return FALSE;
+	 if (!xdr_vector (xdrs, (char *)objp->chan_list, CHANLSTSIZ,
+		sizeof (chan_s), (xdrproc_t) xdr_chan_s))
+		 return FALSE;
 	return TRUE;
 }
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 3df26cb3e..c8c3ee68f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -94,15 +94,17 @@ hamlibdocdir = @hamlibdocdir@
 install_sh = @install_sh@
 
 INCLUDES = @INCLUDES@ @INCLTDL@
-RIGSRC = rig.c serial.c misc.c register.c event.c cal.c conf.c tones.c
+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
+
 
 lib_LTLIBRARIES = libhamlib.la
 libhamlib_la_SOURCES = $(RIGSRC)
 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
+libhamlib_la_LIBADD = @LIBLTDL@ ../lib/libmisc.la -lm
 
-noinst_HEADERS = event.h misc.h serial.h cal.h conf.h tones.h
+noinst_HEADERS = event.h misc.h serial.h cal.h conf.h tones.h rot_conf.h
 subdir = src
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/include/config.h
@@ -113,7 +115,9 @@ libhamlib_la_DEPENDENCIES = ../lib/libmisc.la
 am_libhamlib_la_OBJECTS = libhamlib_la-rig.lo libhamlib_la-serial.lo \
 	libhamlib_la-misc.lo libhamlib_la-register.lo \
 	libhamlib_la-event.lo libhamlib_la-cal.lo libhamlib_la-conf.lo \
-	libhamlib_la-tones.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_OBJECTS = $(am_libhamlib_la_OBJECTS)
 
 DEFS = @DEFS@
@@ -125,9 +129,13 @@ 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-locator.Plo \
 @AMDEP_TRUE@	$(DEPDIR)/libhamlib_la-misc.Plo \
 @AMDEP_TRUE@	$(DEPDIR)/libhamlib_la-register.Plo \
 @AMDEP_TRUE@	$(DEPDIR)/libhamlib_la-rig.Plo \
+@AMDEP_TRUE@	$(DEPDIR)/libhamlib_la-rot_conf.Plo \
+@AMDEP_TRUE@	$(DEPDIR)/libhamlib_la-rot_reg.Plo \
+@AMDEP_TRUE@	$(DEPDIR)/libhamlib_la-rotator.Plo \
 @AMDEP_TRUE@	$(DEPDIR)/libhamlib_la-serial.Plo \
 @AMDEP_TRUE@	$(DEPDIR)/libhamlib_la-tones.Plo
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -191,6 +199,10 @@ libhamlib_la-event.lo: event.c
 libhamlib_la-cal.lo: cal.c
 libhamlib_la-conf.lo: conf.c
 libhamlib_la-tones.lo: tones.c
+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: $(libhamlib_la_OBJECTS) $(libhamlib_la_DEPENDENCIES) 
 	$(LINK) -rpath $(libdir) $(libhamlib_la_LDFLAGS) $(libhamlib_la_OBJECTS) $(libhamlib_la_LIBADD) $(LIBS)
 
@@ -203,9 +215,13 @@ 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-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@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libhamlib_la-rig.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libhamlib_la-rot_conf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libhamlib_la-rot_reg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libhamlib_la-rotator.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libhamlib_la-serial.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libhamlib_la-tones.Plo@am__quote@
 
@@ -373,6 +389,78 @@ libhamlib_la-tones.lo: tones.c
 @AMDEP_TRUE@	depfile='$(DEPDIR)/libhamlib_la-tones.Plo' tmpdepfile='$(DEPDIR)/libhamlib_la-tones.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-tones.lo `test -f tones.c || echo '$(srcdir)/'`tones.c
+
+libhamlib_la-rotator.o: rotator.c
+@AMDEP_TRUE@	source='rotator.c' object='libhamlib_la-rotator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/libhamlib_la-rotator.Po' tmpdepfile='$(DEPDIR)/libhamlib_la-rotator.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhamlib_la_CFLAGS) $(CFLAGS) -c -o libhamlib_la-rotator.o `test -f rotator.c || echo '$(srcdir)/'`rotator.c
+
+libhamlib_la-rotator.obj: rotator.c
+@AMDEP_TRUE@	source='rotator.c' object='libhamlib_la-rotator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/libhamlib_la-rotator.Po' tmpdepfile='$(DEPDIR)/libhamlib_la-rotator.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhamlib_la_CFLAGS) $(CFLAGS) -c -o libhamlib_la-rotator.obj `cygpath -w rotator.c`
+
+libhamlib_la-rotator.lo: rotator.c
+@AMDEP_TRUE@	source='rotator.c' object='libhamlib_la-rotator.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/libhamlib_la-rotator.Plo' tmpdepfile='$(DEPDIR)/libhamlib_la-rotator.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-rotator.lo `test -f rotator.c || echo '$(srcdir)/'`rotator.c
+
+libhamlib_la-locator.o: locator.c
+@AMDEP_TRUE@	source='locator.c' object='libhamlib_la-locator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/libhamlib_la-locator.Po' tmpdepfile='$(DEPDIR)/libhamlib_la-locator.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhamlib_la_CFLAGS) $(CFLAGS) -c -o libhamlib_la-locator.o `test -f locator.c || echo '$(srcdir)/'`locator.c
+
+libhamlib_la-locator.obj: locator.c
+@AMDEP_TRUE@	source='locator.c' object='libhamlib_la-locator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/libhamlib_la-locator.Po' tmpdepfile='$(DEPDIR)/libhamlib_la-locator.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhamlib_la_CFLAGS) $(CFLAGS) -c -o libhamlib_la-locator.obj `cygpath -w locator.c`
+
+libhamlib_la-locator.lo: locator.c
+@AMDEP_TRUE@	source='locator.c' object='libhamlib_la-locator.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/libhamlib_la-locator.Plo' tmpdepfile='$(DEPDIR)/libhamlib_la-locator.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-locator.lo `test -f locator.c || echo '$(srcdir)/'`locator.c
+
+libhamlib_la-rot_reg.o: rot_reg.c
+@AMDEP_TRUE@	source='rot_reg.c' object='libhamlib_la-rot_reg.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/libhamlib_la-rot_reg.Po' tmpdepfile='$(DEPDIR)/libhamlib_la-rot_reg.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhamlib_la_CFLAGS) $(CFLAGS) -c -o libhamlib_la-rot_reg.o `test -f rot_reg.c || echo '$(srcdir)/'`rot_reg.c
+
+libhamlib_la-rot_reg.obj: rot_reg.c
+@AMDEP_TRUE@	source='rot_reg.c' object='libhamlib_la-rot_reg.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/libhamlib_la-rot_reg.Po' tmpdepfile='$(DEPDIR)/libhamlib_la-rot_reg.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhamlib_la_CFLAGS) $(CFLAGS) -c -o libhamlib_la-rot_reg.obj `cygpath -w rot_reg.c`
+
+libhamlib_la-rot_reg.lo: rot_reg.c
+@AMDEP_TRUE@	source='rot_reg.c' object='libhamlib_la-rot_reg.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/libhamlib_la-rot_reg.Plo' tmpdepfile='$(DEPDIR)/libhamlib_la-rot_reg.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_reg.lo `test -f rot_reg.c || echo '$(srcdir)/'`rot_reg.c
+
+libhamlib_la-rot_conf.o: rot_conf.c
+@AMDEP_TRUE@	source='rot_conf.c' object='libhamlib_la-rot_conf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/libhamlib_la-rot_conf.Po' tmpdepfile='$(DEPDIR)/libhamlib_la-rot_conf.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhamlib_la_CFLAGS) $(CFLAGS) -c -o libhamlib_la-rot_conf.o `test -f rot_conf.c || echo '$(srcdir)/'`rot_conf.c
+
+libhamlib_la-rot_conf.obj: rot_conf.c
+@AMDEP_TRUE@	source='rot_conf.c' object='libhamlib_la-rot_conf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/libhamlib_la-rot_conf.Po' tmpdepfile='$(DEPDIR)/libhamlib_la-rot_conf.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhamlib_la_CFLAGS) $(CFLAGS) -c -o libhamlib_la-rot_conf.obj `cygpath -w rot_conf.c`
+
+libhamlib_la-rot_conf.lo: rot_conf.c
+@AMDEP_TRUE@	source='rot_conf.c' object='libhamlib_la-rot_conf.lo' libtool=yes @AMDEPBACKSLASH@
+@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
 CCDEPMODE = @CCDEPMODE@
 uninstall-info-am:
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index fe42ff1c4..bb0b0cbd8 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -97,7 +97,7 @@ install_sh = @install_sh@
 bin_PROGRAMS = rigctl
 man_MANS = rigctl.1
 
-noinst_PROGRAMS = dumpcaps dumpmem testcaps testrig testtrn testbcd testfreq listrigs testcpp @RIGMATRIX@
+noinst_PROGRAMS = dumpcaps dumpmem testcaps testrig testtrn testbcd testfreq listrigs testcpp testloc @RIGMATRIX@
 
 EXTRA_PROGRAMS = rigmatrix
 
@@ -111,9 +111,13 @@ dumpmem_LDFLAGS = @BACKENDLNK@
 testcaps_LDFLAGS = @BACKENDLNK@
 testrig_LDFLAGS = @BACKENDLNK@
 testtrn_LDFLAGS = @BACKENDLNK@
-testbcd_LDFLAGS = @BACKENDLNK@
 testfreq_LDFLAGS = @BACKENDLNK@
 rigctl_LDFLAGS = @BACKENDLNK@
+
+# temporary hack
+testbcd_LDFLAGS = -dlpreopen self
+testloc_LDFLAGS = -dlpreopen self
+
 # rigmatrix needs also libgd
 rigmatrix_LDFLAGS = -lgd -lz @BACKENDLNK@
 testcpp_LDADD = ../c++/libhamlib++.la
@@ -129,16 +133,6 @@ rigctl_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@
 rigmatrix_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@
 testcpp_DEPENDENCIES = ../c++/libhamlib++.la @BACKENDEPS@
 
-testrig_SOURCES = testrig.c
-testtrn_SOURCES = testtrn.c
-testbcd_SOURCES = testbcd.c
-testfreq_SOURCES = testfreq.c
-dumpcaps_SOURCES = dumpcaps.c
-dumpmem_SOURCES = dumpmem.c
-testcaps_SOURCES = testcaps.c
-listrigs_SOURCES = listrigs.c
-rigctl_SOURCES = rigctl.c
-rigmatrix_SOURCES = rigmatrix.c
 testcpp_SOURCES = testcpp.cc
 
 EXTRA_DIST = rigmatrix_head.html $(man_MANS)
@@ -151,42 +145,46 @@ bin_PROGRAMS = rigctl$(EXEEXT)
 noinst_PROGRAMS = dumpcaps$(EXEEXT) dumpmem$(EXEEXT) testcaps$(EXEEXT) \
 	testrig$(EXEEXT) testtrn$(EXEEXT) testbcd$(EXEEXT) \
 	testfreq$(EXEEXT) listrigs$(EXEEXT) testcpp$(EXEEXT) \
-	@RIGMATRIX@
+	testloc$(EXEEXT) @RIGMATRIX@
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 
-am_dumpcaps_OBJECTS = dumpcaps.$(OBJEXT)
-dumpcaps_OBJECTS = $(am_dumpcaps_OBJECTS)
+dumpcaps_SOURCES = dumpcaps.c
+dumpcaps_OBJECTS = dumpcaps.$(OBJEXT)
 dumpcaps_LDADD = $(LDADD)
-am_dumpmem_OBJECTS = dumpmem.$(OBJEXT)
-dumpmem_OBJECTS = $(am_dumpmem_OBJECTS)
+dumpmem_SOURCES = dumpmem.c
+dumpmem_OBJECTS = dumpmem.$(OBJEXT)
 dumpmem_LDADD = $(LDADD)
-am_listrigs_OBJECTS = listrigs.$(OBJEXT)
-listrigs_OBJECTS = $(am_listrigs_OBJECTS)
+listrigs_SOURCES = listrigs.c
+listrigs_OBJECTS = listrigs.$(OBJEXT)
 listrigs_LDADD = $(LDADD)
-am_rigctl_OBJECTS = rigctl.$(OBJEXT)
-rigctl_OBJECTS = $(am_rigctl_OBJECTS)
+rigctl_SOURCES = rigctl.c
+rigctl_OBJECTS = rigctl.$(OBJEXT)
 rigctl_LDADD = $(LDADD)
-am_rigmatrix_OBJECTS = rigmatrix.$(OBJEXT)
-rigmatrix_OBJECTS = $(am_rigmatrix_OBJECTS)
+rigmatrix_SOURCES = rigmatrix.c
+rigmatrix_OBJECTS = rigmatrix.$(OBJEXT)
 rigmatrix_LDADD = $(LDADD)
-am_testbcd_OBJECTS = testbcd.$(OBJEXT)
-testbcd_OBJECTS = $(am_testbcd_OBJECTS)
+testbcd_SOURCES = testbcd.c
+testbcd_OBJECTS = testbcd.$(OBJEXT)
 testbcd_LDADD = $(LDADD)
 testbcd_DEPENDENCIES = ../src/libhamlib.la
-am_testcaps_OBJECTS = testcaps.$(OBJEXT)
-testcaps_OBJECTS = $(am_testcaps_OBJECTS)
+testcaps_SOURCES = testcaps.c
+testcaps_OBJECTS = testcaps.$(OBJEXT)
 testcaps_LDADD = $(LDADD)
 am_testcpp_OBJECTS = testcpp.$(OBJEXT)
 testcpp_OBJECTS = $(am_testcpp_OBJECTS)
-am_testfreq_OBJECTS = testfreq.$(OBJEXT)
-testfreq_OBJECTS = $(am_testfreq_OBJECTS)
+testfreq_SOURCES = testfreq.c
+testfreq_OBJECTS = testfreq.$(OBJEXT)
 testfreq_LDADD = $(LDADD)
 testfreq_DEPENDENCIES = ../src/libhamlib.la
-am_testrig_OBJECTS = testrig.$(OBJEXT)
-testrig_OBJECTS = $(am_testrig_OBJECTS)
+testloc_SOURCES = testloc.c
+testloc_OBJECTS = testloc.$(OBJEXT)
+testloc_LDADD = $(LDADD)
+testloc_DEPENDENCIES = ../src/libhamlib.la
+testrig_SOURCES = testrig.c
+testrig_OBJECTS = testrig.$(OBJEXT)
 testrig_LDADD = $(LDADD)
-am_testtrn_OBJECTS = testtrn.$(OBJEXT)
-testtrn_OBJECTS = $(am_testtrn_OBJECTS)
+testtrn_SOURCES = testtrn.c
+testtrn_OBJECTS = testtrn.$(OBJEXT)
 testtrn_LDADD = $(LDADD)
 
 DEFS = @DEFS@
@@ -199,8 +197,8 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
 @AMDEP_TRUE@	$(DEPDIR)/listrigs.Po $(DEPDIR)/rigctl.Po \
 @AMDEP_TRUE@	$(DEPDIR)/rigmatrix.Po $(DEPDIR)/testbcd.Po \
 @AMDEP_TRUE@	$(DEPDIR)/testcaps.Po $(DEPDIR)/testcpp.Po \
-@AMDEP_TRUE@	$(DEPDIR)/testfreq.Po $(DEPDIR)/testrig.Po \
-@AMDEP_TRUE@	$(DEPDIR)/testtrn.Po
+@AMDEP_TRUE@	$(DEPDIR)/testfreq.Po $(DEPDIR)/testloc.Po \
+@AMDEP_TRUE@	$(DEPDIR)/testrig.Po $(DEPDIR)/testtrn.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -218,15 +216,14 @@ CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(dumpcaps_SOURCES) $(dumpmem_SOURCES) \
-	$(listrigs_SOURCES) $(rigctl_SOURCES) $(rigmatrix_SOURCES) \
-	$(testbcd_SOURCES) $(testcaps_SOURCES) $(testcpp_SOURCES) \
-	$(testfreq_SOURCES) $(testrig_SOURCES) $(testtrn_SOURCES)
+DIST_SOURCES = dumpcaps.c dumpmem.c listrigs.c rigctl.c rigmatrix.c \
+	testbcd.c testcaps.c $(testcpp_SOURCES) testfreq.c testloc.c \
+	testrig.c testtrn.c
 
 NROFF = nroff
 MANS = $(man_MANS)
 DIST_COMMON = README Makefile.am Makefile.in
-SOURCES = $(dumpcaps_SOURCES) $(dumpmem_SOURCES) $(listrigs_SOURCES) $(rigctl_SOURCES) $(rigmatrix_SOURCES) $(testbcd_SOURCES) $(testcaps_SOURCES) $(testcpp_SOURCES) $(testfreq_SOURCES) $(testrig_SOURCES) $(testtrn_SOURCES)
+SOURCES = dumpcaps.c dumpmem.c listrigs.c rigctl.c rigmatrix.c testbcd.c testcaps.c $(testcpp_SOURCES) testfreq.c testloc.c testrig.c testtrn.c
 
 all: all-am
 
@@ -302,6 +299,9 @@ testcpp$(EXEEXT): $(testcpp_OBJECTS) $(testcpp_DEPENDENCIES)
 testfreq$(EXEEXT): $(testfreq_OBJECTS) $(testfreq_DEPENDENCIES) 
 	@rm -f testfreq$(EXEEXT)
 	$(LINK) $(testfreq_LDFLAGS) $(testfreq_OBJECTS) $(testfreq_LDADD) $(LIBS)
+testloc$(EXEEXT): $(testloc_OBJECTS) $(testloc_DEPENDENCIES) 
+	@rm -f testloc$(EXEEXT)
+	$(LINK) $(testloc_LDFLAGS) $(testloc_OBJECTS) $(testloc_LDADD) $(LIBS)
 testrig$(EXEEXT): $(testrig_OBJECTS) $(testrig_DEPENDENCIES) 
 	@rm -f testrig$(EXEEXT)
 	$(LINK) $(testrig_LDFLAGS) $(testrig_OBJECTS) $(testrig_LDADD) $(LIBS)
@@ -324,6 +324,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testcaps.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testcpp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testfreq.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testloc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testrig.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testtrn.Po@am__quote@