Skip to content

Commit e53842d

Browse files
committed
Don't build tpcomp, it's only useful out-of-tree
.. the manpage is still generated. This is done simply to get rid of the diagnostic message when it's built in-tree. I considered the alternative of providing a TOPDIR value during build, but as I would only be able to test it during a uspace build I decided not to do so. I'd be happy to see it done as a substitute, though, as otherwise the component is likely to bitrot.
1 parent 9d7dec3 commit e53842d

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

src/hal/components/Submakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ CONVERTERS := \
77
conv_bit_s32.comp conv_bit_u32.comp conv_bit_float.comp \
88
conv_s32_float.comp conv_s32_bit.comp conv_s32_u32.comp \
99
conv_u32_float.comp conv_u32_bit.comp conv_u32_s32.comp
10-
COMPS := $(sort $(wildcard hal/components/*.comp) $(addprefix hal/components/, $(CONVERTERS)))
11-
COMP_MANPAGES := $(patsubst hal/components/%.comp, ../docs/man/man9/%.9, $(COMPS))
10+
COMPS := $(filter-out hal/components/tpcomp.comp, $(sort $(wildcard hal/components/*.comp) $(addprefix hal/components/, $(CONVERTERS))))
11+
COMP_MANPAGES := $(patsubst hal/components/%.comp, ../docs/man/man9/%.9, $(COMPS)) ../docs/man/man9/tpcomp.9
1212
ifeq ($(BUILD_SYS),uspace)
1313
COMP_DRIVERS += hal/drivers/serport.comp
1414
COMP_DRIVERS += hal/drivers/mesa_7i65.comp

src/hal/components/tpcomp.comp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ option extra_setup;
6767
#include USE_TOPDIR(src/libnml/posemath/_posemath.c)
6868
#include USE_TOPDIR(src/libnml/posemath/sincos.c)
6969

70+
#else
71+
#error No TOPDIR defined, skeleton component provides no trajectory planning functions.
7072
#endif // }
7173
//=====================================================================
7274

@@ -80,12 +82,7 @@ RTAPI_MP_STRING(tp_parms,"Example tp parms");
8082
EXTRA_SETUP() {
8183
if (!tp_parms) {tp_parms="no_tp_parms";}
8284
rtapi_print("@@@%s:%s: tp_parms=%s\n",__FILE__,__FUNCTION__,tp_parms);
83-
#ifndef TOPDIR
84-
#warning No TOPDIR defined, skeleton component provides no trajectory planning functions.
85-
rtapi_print("\n!!!%s: NO Trajectory Planning symbols provided\n\n",__FILE__);
86-
#else
8785
rtapi_print("\n@@@%s: TOPDIR=%s\n",__FILE__,XSTR(TOPDIR));
88-
#endif
8986
return 0;
9087
}
9188
#undef USE_TOPDIR

0 commit comments

Comments
 (0)