build: Remove the duplicated mksymtab.sh

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
zouboan · May 24, 2020 · d03ff1b · d03ff1b
1 parent 69f013e
commit d03ff1b
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 346 deletions.
diff --git a/Makefile b/Makefile
@@ -94,7 +94,7 @@ else
 
 $(SYMTABSRC): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
 	$(Q) $(MAKE) install TOPDIR="$(TOPDIR)"
-	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BINDIR) $@.tmp
+	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BINDIR) >$@.tmp
 	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
 
 $(SYMTABOBJ): %$(OBJEXT): %.c

diff --git a/examples/elf/tests/Makefile b/examples/elf/tests/Makefile
@@ -124,7 +124,7 @@ $(DIRLIST_SRC): install
 # Create the exported symbol table
 
 $(SYMTAB_SRC): install
-	$(Q) $(TESTS_DIR)/mksymtab.sh $(FSIMG_DIR) >$@.tmp
+	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(FSIMG_DIR) g_elf >$@.tmp
 	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
 
 # Clean each subdirectory

diff --git a/examples/elf/tests/mksymtab.sh b/examples/elf/tests/mksymtab.sh
diff --git a/examples/module/drivers/Makefile b/examples/module/drivers/Makefile
@@ -107,7 +107,7 @@ endif
 # Create the exported symbol table
 
 $(SYMTAB_SRC): install
-	$(Q) $(DRIVER_DIR)/mksymtab.sh $(FSROOT_DIR) >$@.tmp
+	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(FSROOT_DIR) g_mod >$@.tmp
 	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
 
 # Copy the symbol table into the kernel pass1/ build directory

diff --git a/examples/module/drivers/mksymtab.sh b/examples/module/drivers/mksymtab.sh
diff --git a/examples/nxflat/tests/Makefile b/examples/nxflat/tests/Makefile
@@ -88,7 +88,7 @@ $(DIRLIST_SRC): install
 # Create the exported symbol table list from the derived *-thunk.S files
 
 $(SYMTAB_SRC): install
-	$(Q) $(TESTS_DIR)/mksymtab.sh $(ROMFS_DIR) >$@.tmp
+	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(ROMFS_DIR) g_nxflat >$@.tmp
 	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
 
 # Clean each subdirectory

diff --git a/examples/nxflat/tests/mksymtab.sh b/examples/nxflat/tests/mksymtab.sh
diff --git a/examples/posix_spawn/filesystem/Makefile b/examples/posix_spawn/filesystem/Makefile
@@ -73,7 +73,7 @@ $(ROMFS_SRC): $(ROMFS_IMG)
 # Create the exported symbol table
 
 $(SYMTAB_SRC): $(ROMFS_IMG)
-	$(Q) $(FILESYSTEM_DIR)$(DELIM)mksymtab.sh $(ROMFS_DIR) >$@.tmp
+	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(ROMFS_DIR) g_spawn >$@.tmp
 	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
 
 # Clean each subdirectory

diff --git a/examples/posix_spawn/filesystem/mksymtab.sh b/examples/posix_spawn/filesystem/mksymtab.sh
diff --git a/examples/sotest/lib/Makefile b/examples/sotest/lib/Makefile
@@ -84,7 +84,7 @@ endif
 # Create the exported symbol table
 
 $(SYMTAB_SRC): install
-	$(Q) $(LIB_DIR)/mksymtab.sh $(FSROOT_DIR) >$@.tmp
+	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(FSROOT_DIR) g_sot | sed "/modprint/d" >$@.tmp
 	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
 
 # Clean each subdirectory

diff --git a/examples/sotest/lib/mksymtab.sh b/examples/sotest/lib/mksymtab.sh
diff --git a/examples/thttpd/content/Makefile.nxflat b/examples/thttpd/content/Makefile.nxflat
@@ -76,7 +76,7 @@ $(ROMFS_SRC): $(ROMFS_IMG)
 # Create the exported symbol table list from the derived *-thunk.S files
 
 $(SYMTAB_SRC): install
-	$(Q) $(CONTENT_DIR)/mksymtab.sh $(CONTENT_DIR) >$@.tmp
+	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(CONTENT_DIR) g_thttpd >$@.tmp
 	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
 
 # Nothing special needs to be done during the context phase

diff --git a/examples/thttpd/content/mksymtab.sh b/examples/thttpd/content/mksymtab.sh