Make the -a option to ubx_tocarr optional

We know make the -a option to ubx_tocarr optional, but we generate the struct name from the filename. If we want the struct name to be different to the convention of struct = filename_ext. Signed-off-by: Hamish Guthrie <hamish.guthrie@kistler.com>
kmarkus · Nov 29, 2019 · b7bda65 · b7bda65
1 parent 3908c1c
commit b7bda65
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 11 deletions.
diff --git a/std_blocks/cppdemo/Makefile.am b/std_blocks/cppdemo/Makefile.am
@@ -13,4 +13,4 @@ cppdemo_la_LIBADD = $(top_builddir)/libubx/libubx.la
 cppdemo_la_CPPFLAGS = -I$(top_srcdir)/libubx
 
 %.h.hexarr: %.h
-	$(top_srcdir)/tools/ubx_tocarr -s $< -d $<.hexarr -a $(basename $(notdir $<))$(subst .,_,$(suffix $<))
+	$(top_srcdir)/tools/ubx_tocarr -s $< -d $<.hexarr
diff --git a/std_blocks/logging/Makefile.am b/std_blocks/logging/Makefile.am
@@ -8,7 +8,7 @@ BUILT_SOURCES = file_logger.lua.hexarr
 CLEANFILES = $(BUILT_SOURCES)
 
 %.lua.hexarr: %.lua
-	$(top_srcdir)/tools/ubx_tocarr -s $< -d $<.hexarr -a $(basename $(notdir $<))$(subst .,_,$(suffix $<))
+	$(top_srcdir)/tools/ubx_tocarr -s $< -d $<.hexarr
 
 logger_la_includes = $(top_srcdir)/libubx/ubx.h \
                      $(top_srcdir)/libubx/ubx_types.h

diff --git a/std_blocks/ptrig/Makefile.am b/std_blocks/ptrig/Makefile.am
@@ -19,7 +19,7 @@ BUILT_SOURCES = types/ptrig_config.h.hexarr \
 CLEANFILES = $(BUILT_SOURCES)
 
 %.h.hexarr: %.h
-	$(top_srcdir)/tools/ubx_tocarr -s $< -d $<.hexarr -a $(basename $(notdir $<))$(subst .,_,$(suffix $<))
+	$(top_srcdir)/tools/ubx_tocarr -s $< -d $<.hexarr
 
 ptrig_la_includes = $(top_srcdir)/libubx/ubx.h \
                     $(top_srcdir)/libubx/ubx_types.h

diff --git a/std_blocks/random/Makefile.am b/std_blocks/random/Makefile.am
@@ -14,4 +14,4 @@ random_la_LDFLAGS = -module -avoid-version -shared -export-dynamic
 random_la_LIBADD = $(top_builddir)/libubx/libubx.la
 
 %.h.hexarr: %.h
-	$(top_srcdir)/tools/ubx_tocarr -s $< -d $<.hexarr -a $(basename $(notdir $<))$(subst .,_,$(suffix $<))
+	$(top_srcdir)/tools/ubx_tocarr -s $< -d $<.hexarr
diff --git a/std_blocks/trig/Makefile.am b/std_blocks/trig/Makefile.am
@@ -18,7 +18,7 @@ BUILT_SOURCES = types/trig_config.h.hexarr \
 CLEANFILES = $(BUILT_SOURCES)
 
 %.h.hexarr: %.h
-	$(top_srcdir)/tools/ubx_tocarr -s $< -d $<.hexarr -a $(basename $(notdir $<))$(subst .,_,$(suffix $<))
+	$(top_srcdir)/tools/ubx_tocarr -s $< -d $<.hexarr
 
 trig_la_includes = $(top_srcdir)/libubx/ubx.h $(top_srcdir)/libubx/ubx_types.h
 trig_la_SOURCES = $(trig_la_includes) trig.c

diff --git a/std_blocks/webif/Makefile.am b/std_blocks/webif/Makefile.am
@@ -16,4 +16,4 @@ webif_la_LIBADD = $(top_builddir)/libubx/libubx.la
 webif_la_CFLAGS = -I$(top_srcdir)/libubx $(LUAJIT_CFLAGS) @UBX_CFLAGS@
 
 %.lua.hexarr: %.lua
-	$(top_srcdir)/tools/ubx_tocarr -s $< -d $<.hexarr -a $(basename $(notdir $<))$(subst .,_,$(suffix $<))
+	$(top_srcdir)/tools/ubx_tocarr -s $< -d $<.hexarr
diff --git a/std_types/stattypes/Makefile.am b/std_types/stattypes/Makefile.am
@@ -10,7 +10,7 @@ pkginclude_HEADERS = types/tstat.h \
 		    types/tstat.h.hexarr
 
 %.h.hexarr: %.h
-	$(top_srcdir)/tools/ubx_tocarr -s $< -d $<.hexarr -a $(basename $(notdir $<))$(subst .,_,$(suffix $<))
+	$(top_srcdir)/tools/ubx_tocarr -s $< -d $<.hexarr
 
 # stattypes : The basic types
 stattypes_la_includes = $(top_srcdir)/libubx/ubx.h

diff --git a/std_types/testtypes/Makefile.am b/std_types/testtypes/Makefile.am
@@ -10,7 +10,7 @@ BUILT_SOURCES = types/test_trig_conf.h.hexarr \
 CLEANFILES = $(BUILT_SOURCES)
 
 %.h.hexarr: %.h
-	$(top_srcdir)/tools/ubx_tocarr -s $< -d $<.hexarr -a $(basename $(notdir $<))$(subst .,_,$(suffix $<))
+	$(top_srcdir)/tools/ubx_tocarr -s $< -d $<.hexarr
 
 # testtypes : The basic types
 testtypes_la_includes = $(top_srcdir)/libubx/ubx.h

diff --git a/tools/ubx_genblock b/tools/ubx_genblock
@@ -284,7 +284,7 @@ $(bm.name)_la_CPPFLAGS = -I${top_srcdir}/libubx @UBX_CFLAGS@
 $(bm.name)_la_CFLAGS = -I${top_srcdir}/libubx @UBX_CFLAGS@
 @ end
 %.h.hexarr: %.h
-	ubx_tocarr -s $< -d $<.hexarr -a $(basename $(notdir $<))$(subst .,_,$(suffix $<))
+	ubx_tocarr -s $< -d $<.hexarr
 
 ]], { bm=bm, gen_built_sources=gen_built_sources, table=table })
 

diff --git a/tools/ubx_tocarr b/tools/ubx_tocarr
@@ -82,8 +82,7 @@ else
 end
 
 if not (opttab['-a'] and opttab['-a'][1]) then
-   usage()
-   os.exit(1)
+   structname = string.gsub(filename(srcfile), "[-.]", "_")
 else
    structname=opttab['-a'][1]
 end