untangle: break the src/ include cycle into three

src/Makefile

@@ -194,7 +194,7 @@ SUBDIRS := \
     \
     $(GUI_SUBDIRS) \
     emc/usr_intf/axis emc/usr_intf emc/nml_intf emc/task emc/kinematics emc/tp emc/canterp \
-    emc/motion emc/ini emc/rs274ngc emc/sai emc/pythonplugin \
+    emc/ini emc/rs274ngc emc/sai emc/pythonplugin \
     emc/motion-logger \
     emc/tooldata \
     emc \
@@ -403,7 +403,7 @@ SRCHEADERS := \
     hal/drivers/mesa-hostmot2/hostmot2-serial.h \
     emc/linuxcnc.h \
     emc/kinematics/kinematics.h \
-    emc/motion/emcmotcfg.h \
+    emc/nml_intf/emcmotcfg.h \
     emc/ini/inifile.hh \
     emc/ini/inifile.h \
     emc/nml_intf/emcpos.h \

src/emc/canterp/canterp.cc

@@ -59,7 +59,7 @@
 #include "nml_intf/interp_return.hh"
 #include "nml_intf/canon.hh"
 #include "rs274ngc/interp_base.hh"
-#include "rs274ngc/modal_state.hh"
+#include "nml_intf/modal_state.hh"
 
 static char the_command[LINELEN] = { 0 };	// our current command
 static char the_command_name[LINELEN] = { 0 };	// just the name part

src/emc/motion/control.c

@@ -34,7 +34,7 @@
 #include "config.h"
 #include "homing.h"
 #include "axis.h"
-#include "state_tag.h"
+#include "../nml_intf/state_tag.h"
 
 // Mark strings for translation, but defer translation to userspace
 #define _(s) (s)

src/emc/motion/motion.h

@@ -72,7 +72,7 @@ to another.
 #include <kinematics.h>
 
 #include "simple_tp.h"
-#include "state_tag.h"
+#include "../nml_intf/state_tag.h"
 #include "../tp/tp_types.h"
 
 // define a special value to denote an invalid motion ID

src/emc/nml_intf/Submakefile

@@ -1,7 +1,7 @@
 
 LIBEMCSRCS := \
     emc/nml_intf/emcglb.c \
-    emc/rs274ngc/modal_state.cc \
+    emc/nml_intf/modal_state.cc \
     emc/nml_intf/emc.cc \
     emc/nml_intf/emcpose.c \
     emc/nml_intf/emcargs.cc \
@@ -26,6 +26,7 @@ TARGETS += ../lib/liblinuxcnc.a
 	@$(AR) $(ARFLAGS) $@ $^
 
 EMCNMLINTFINCS = \
+	./emc/nml_intf/emcmotcfg.h \
 	./emc/nml_intf/emcpos.h \
 	./emc/nml_intf/emcpose.h \
 	./emc/nml_intf/motion_types.h

src/emc/nml_intf/canon.hh

@@ -20,7 +20,7 @@
 #include "emctool.h"
 #include "canon_position.hh"
 #include <emcmotcfg.h> // Just for EMCMOT_NUM_SPINDLES
-#include "rs274ngc/modal_state.hh"
+#include "modal_state.hh"
 
 /*
   This is the header file that all applications that use the

src/emc/nml_intf/emc.hh

@@ -19,7 +19,7 @@
 #include "libnml/nml/nml_type.hh"
 #include "motion_types.h"
 #include <stdint.h>
-#include "rs274ngc/modal_state.hh"
+#include "modal_state.hh"
 
 // Forward class declarations
 class EMC_JOINT_STAT;

src/emc/nml_intf/emc_nml.hh

@@ -20,9 +20,9 @@
 #include "libnml/rcs/rcs.hh"
 #include "libnml/nml/cmd_msg.hh"
 #include "libnml/nml/stat_msg.hh"
-#include "rs274ngc/modal_state.hh"
+#include "modal_state.hh"
 #include "canon.hh"		// CANON_TOOL_TABLE, CANON_UNITS
-#include "rs274ngc/rs274ngc.hh"		// ACTIVE_G_CODES, etc
+#include "interp_codes.h"		// ACTIVE_G_CODES, etc
 
 // ------------------
 // CLASS DECLARATIONS

src/emc/nml_intf/emcops.cc

@@ -15,6 +15,7 @@
 * Last change:
 ********************************************************************/
 
+#include "libnml/rcs/rcs_print.hh"
 #include "emc.hh"
 #include "emc_nml.hh"
 #include "tooldata/tooldata.hh"
@@ -221,7 +222,7 @@ EMC_TOOL_STAT& EMC_TOOL_STAT::operator =(const EMC_TOOL_STAT& s)
 #else //}{
     struct CANON_TOOL_TABLE tdata;
     if (tooldata_get(&tdata,0) != IDX_OK) {
-        fprintf(stderr,"UNEXPECTED idx %s %d\n",__FILE__,__LINE__);
+        rcs_print_error("UNEXPECTED idx %s %d\n",__FILE__,__LINE__);
     }
     toolTableCurrent = tdata;
 #endif //}

src/emc/nml_intf/interp_codes.h

@@ -0,0 +1,23 @@
+#ifndef __LINUXCNC_INTERP_CODES_H
+#define __LINUXCNC_INTERP_CODES_H
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+/* Sizes of the arrays of active codes that the interpreter reports and
+   the status message carries. */
+#define ACTIVE_G_CODES 17
+#define ACTIVE_M_CODES 10
+#define ACTIVE_SETTINGS 5
+
+#endif

src/emc/rs274ngc/modal_state.cc → src/emc/nml_intf/modal_state.cc

@@ -19,7 +19,6 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ********************************************************************/
-#include "interp_base.hh"
 #include "modal_state.hh"
 #include <string.h>
 

src/emc/rs274ngc/modal_state.hh → src/emc/nml_intf/modal_state.hh

@@ -27,7 +27,7 @@
 
 // Bring in C struct for a state tag from motion
 extern "C" {
-#include "motion/state_tag.h"
+#include "state_tag.h"
 }
 
 /**

src/emc/rs274ngc/Submakefile

@@ -17,7 +17,6 @@ LIBRS274SRCS := $(addprefix emc/rs274ngc/, \
 	interp_write.cc \
 	interp_o_word.cc \
 	interp_g7x.cc \
-	modal_state.cc \
 	nurbs_additional_functions.cc \
 	interp_namedparams.cc \
 	interp_python.cc \
@@ -32,6 +31,7 @@ LIBRS274SRCS := $(addprefix emc/rs274ngc/, \
 	interpmodule.cc \
 	rs274ngc_pre.cc \
 	interp_inspection.cc)
+LIBRS274SRCS += emc/nml_intf/modal_state.cc
 USERSRCS += $(LIBRS274SRCS)
 
 $(call TOOBJSDEPS, $(LIBRS274SRCS)) : EXTRAFLAGS+=-fPIC $(BOOST_DEBUG_FLAGS)

src/emc/rs274ngc/interp_base.hh

@@ -23,12 +23,8 @@
 #include <stdlib.h>
 #include <boost/noncopyable.hpp>
 #include <emcpos.h>
-#include "modal_state.hh"
-
-/* Size of certain arrays */
-#define ACTIVE_G_CODES 17
-#define ACTIVE_M_CODES 10
-#define ACTIVE_SETTINGS 5
+#include "../nml_intf/modal_state.hh"
+#include "../nml_intf/interp_codes.h"
 
 class InterpBase : boost::noncopyable {
 public:

src/emc/rs274ngc/rs274ngc_interp.hh

@@ -16,6 +16,7 @@
 
 #ifndef RS274NGC_INTERP_H
 #define RS274NGC_INTERP_H
+#include <stdio.h>		// FILE
 #include "rs274ngc.hh"
 #include "interp_internal.hh"
 #include "nml_intf/interp_return.hh"

src/emc/sai/dummyemcstat.cc

@@ -17,6 +17,7 @@
  */
 // keep linker happy so TaskMod can be resolved
 
+#include <stdio.h>
 #include "libnml/rcs/rcs.hh"		// NML classes, nmlErrorFormat()
 #include "nml_intf/emc.hh"		// EMC NML
 #include "nml_intf/emc_nml.hh"

src/emc/task/emccanon.cc

@@ -54,14 +54,15 @@
 #include <math.h>
 #include <string.h>		// strncpy()
 #include <ctype.h>		// isspace()
+#include "libnml/rcs/rcs_print.hh"
 #include "nml_intf/emc.hh"		// EMC NML
 #include "nml_intf/emc_nml.hh"
 #include "nml_intf/canon.hh"
 #include "nml_intf/canon_position.hh"		// data type for a machine position
 #include "nml_intf/interpl.hh"		// interp_list
 #include "nml_intf/emcglb.h"		// TRAJ_MAX_VELOCITY
 #include <rtapi_string.h>
-#include "rs274ngc/modal_state.hh"
+#include "nml_intf/modal_state.hh"
 #include "tooldata/tooldata.hh"
 #include <algorithm>
 
@@ -3703,7 +3704,7 @@ CANON_TOOL_TABLE GET_EXTERNAL_TOOL_TABLE(int idx)
         tdata.orientation = 0;
     } else {
         if (tooldata_get(&tdata,idx) != IDX_OK) {
-            fprintf(stderr,"UNEXPECTED idx %s %d\n",__FILE__,__LINE__);
+            rcs_print_error("UNEXPECTED idx %s %d\n",__FILE__,__LINE__);
         }
     }
     return tdata;

src/emc/task/emcsvr.cc

@@ -13,6 +13,9 @@
 * Last change:
 ********************************************************************/
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <signal.h>
 
 #include "libnml/rcs/rcs.hh"		// EMC NML

src/emc/task/emctask.cc

@@ -13,6 +13,7 @@
 * Last change:
 ********************************************************************/
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <rtapi_string.h>	// rtapi_strlcpy()
 #include <sys/stat.h>		// struct stat

src/emc/task/taskintf.cc

@@ -12,6 +12,7 @@
 *
 ********************************************************************/
 
+#include <stdio.h>
 #include <cmath>
 #include <float.h>		// DBL_MAX
 #include <string.h>		// memcpy() strncpy()

src/emc/tooldata/tool_watch.cc

@@ -19,6 +19,7 @@
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
+#include <stdio.h>
 #include "nml_intf/emc.hh"
 #include "nml_intf/emc_nml.hh"
 #include <unistd.h>

src/emc/tp/tc_types.h

@@ -18,7 +18,7 @@
 #include <emcmotcfg.h>
 
 #include "spherical_arc.h"
-#include "../motion/state_tag.h"
+#include "../nml_intf/state_tag.h"
 
 #define BLEND_DIST_FRACTION 0.5
 /* values for endFlag */

src/emc/usr_intf/axis/extensions/emcmodule.cc

@@ -18,6 +18,8 @@
 //    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #define PY_SSIZE_T_CLEAN
+#include <stdio.h>
+#include <stdlib.h>
 #include <Python.h>
 #include <structseq.h>
 #include <pthread.h>
@@ -26,6 +28,7 @@
 #include "libnml/rcs/rcs.hh"
 #include "nml_intf/emc.hh"
 #include "nml_intf/emc_nml.hh"
+#include "nml_intf/debugflags.h"
 #include <kinematics.h>
 #include "config.h"
 #include <inifile.hh>

src/emc/usr_intf/shcom.cc

@@ -14,6 +14,8 @@
 * Last change:
 ********************************************************************/
 
+#include <stdio.h>
+#include <unistd.h>
 #include <fmt/format.h>
 
 #include <rtapi_string.h>

src/hal/Submakefile

@@ -20,7 +20,7 @@ $(HALLIB).0: $(call TOOBJS, $(HALLIBSRCS))
 	@rm -f $@
 	$(Q)$(CC) $(LDFLAGS) -Wl,-soname,$(notdir $@) -shared -o $@ $^ $(HALLIB_LIBS) $(ULAPI_LDFLAGS)
 
-HALMODULESRCS := hal/halmodule.cc hal/utils/setps_util.c hal/halquery.cc
+HALMODULESRCS := hal/halmodule.cc hal/setps_util.c hal/halquery.cc
 PYSRCS += $(HALMODULESRCS)
 
 HALMODULE := ../lib/python/_hal.so

src/hal/classicladder/files.h

@@ -13,6 +13,8 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#include <stdio.h>		// FILE
+
 #ifndef S_LINE
 //#define S_LINE "<!--"
 //#define E_LINE "-->"

src/hal/halmodule.cc

@@ -28,7 +28,7 @@
 #include <hal.h>
 
 #include "halqrec.hh"
-#include "utils/setps_util.h"
+#include "setps_util.h"
 
 #define EXCEPTION_IF_NOT_LIVE(retval) do { \
         if(self->hal_id <= 0) { \

src/hal/utils/Submakefile

@@ -2,13 +2,13 @@ HALCMDSRCS := \
     hal/utils/halcmd.c \
     hal/utils/halcmd_commands.cc \
     hal/utils/halcmd_main.c \
-    hal/utils/setps_util.c
+    hal/setps_util.c
 
 HALSHSRCS := \
     hal/utils/halcmd.c \
     hal/utils/halcmd_commands.cc \
     hal/utils/halsh.c \
-    hal/utils/setps_util.c
+    hal/setps_util.c
 
 ifneq ($(READLINE_LIBS),)
 HALCMDSRCS += hal/utils/halcmd_completion.c
@@ -33,7 +33,7 @@ endif
 	$(Q)$(CXX) $(LDFLAGS) -o $@ $^ $(READLINE_LIBS) -lfmt
 TARGETS += ../bin/halcmd
 
-HALRMTSRCS := hal/utils/halrmt.cc hal/utils/setps_util.c
+HALRMTSRCS := hal/utils/halrmt.cc hal/setps_util.c
 USERSRCS += $(HALRMTSRCS)
 
 ../bin/halrmt: $(call TOOBJS, $(HALRMTSRCS)) ../lib/liblinuxcnchal.so.0 ../lib/liblinuxcncini.so.1

src/hal/utils/halcmd_commands.cc

@@ -59,7 +59,7 @@
 #include <vector>
 #include <fmt/format.h>
 
-#include "setps_util.h"
+#include "hal/setps_util.h"
 
 static int unloadrt_comp(const char *mod_name);
 static void print_comp_info(const char **patterns);

src/hal/utils/halrmt.cc

@@ -56,7 +56,7 @@
 #include <hal.h>
 #include <inifile.hh>
 
-#include "setps_util.h"
+#include "hal/setps_util.h"
 
 using namespace linuxcnc;
 

src/hal/utils/scope_usr.h

@@ -37,6 +37,7 @@
 */
 
 /* import the shared declarations */
+#include <stdio.h>		// FILE
 #include "scope_shm.h"
 
 /***********************************************************************

src/rtapi/uspace_rtapi_main.cc

@@ -57,7 +57,6 @@
 #include <boost/lockfree/queue.hpp>
 
 #include "rtapi.h"
-#include <hal.h>
 #include "uspace_common.h"
 
 static RtapiApp &App();