Add rule for .js files and fix Linux specific extension substitution

diff --git a/scripts/boiler.mk b/scripts/boiler.mk
index c9a31debd4ba6c4c3729b2cf77b1bab28e002251..59dd8c64014d7f63b59bb9939f6cc0f8a747e00c 100644 (file)
--- a/scripts/boiler.mk
+++ b/scripts/boiler.mk
@@ -437,7 +437,7 @@ define INCLUDE_SUBMAKEFILE
         $${TGT}_POSTMAKE := $${TGT_POSTMAKE}
         $${TGT}_POSTCLEAN := $${TGT_POSTCLEAN}
         $${TGT}_POSTINSTALL := $${TGT_POSTINSTALL}
-        $${TGT}_PRBIN := $$(addprefix $${BUILD_DIR}/bin/,$$(filter-out %.a %.so %.la,$${TGT_PREREQS}))
+        $${TGT}_PRBIN := $$(addprefix $${BUILD_DIR}/bin/,$$(filter-out %.a %.${TARGET_LIB_EXT} %.la,$${TGT_PREREQS}))
         $${TGT}_DEPS :=
         $${TGT}_OBJS :=
         $${TGT}_SOURCES :=
@@ -448,13 +448,13 @@ define INCLUDE_SUBMAKEFILE
         #  which FOO needs.  That way we don't have to manually specify the recursive library
         #  references.
        $${TGT}_PREREQS := $$(strip $$(call uniq,$$(foreach x,$${TGT_PREREQS},$$(or $${$${x}_PREREQS},) $${x})))
-        $${TGT}_PRLIBS := $$(addprefix $${BUILD_DIR}/lib/,$$(filter %.a %.so %.la,$${$${TGT}_PREREQS}))
+        $${TGT}_PRLIBS := $$(addprefix $${BUILD_DIR}/lib/,$$(filter %.a %.la %.${TARGET_LIB_EXT},$${$${TGT}_PREREQS}))
 
         # If it's an EXE, ensure that transitive library linking works.
         # i.e. we build libfoo.a which in turn requires -lbar.  So, the executable
         # has to be linked to both libfoo.a and -lbar.
        ifeq "$${$${TGT}_SUFFIX}" ".exe"
-               $${TGT}_LDLIBS += $$(filter-out %.a %.so %.la,$${$${TGT_PREREQS}_LDLIBS})
+               $${TGT}_LDLIBS += $$(filter-out %.a %.la %.${TARGET_LIB_EXT},$${$${TGT_PREREQS}_LDLIBS})
 
                #
                #  OSX does lazy linking by default.  We want to over-ride that for binaries.

diff --git a/scripts/libtool.mk b/scripts/libtool.mk
index 60b3e9c77fe32fc1ca404e3527909dbe586fa9e4..1cc65c6195cbf50440423268af368d00e93a2853 100644 (file)
--- a/scripts/libtool.mk
+++ b/scripts/libtool.mk
@@ -121,7 +121,7 @@ PROGRAM_INSTALL = ${LIBTOOL} ${LIBTOOL_VERBOSE} --target=${TARGET_SYSTEM} --mode
 #   extension with ".la".
 #
 define LIBTOOL_ENDINGS
-$(patsubst %.a,%.la,$(patsubst %.so,%.la,${1}))
+$(patsubst %.a,%.la,$(patsubst %.$(TARGET_LIB_EXT),%.la,${1}))
 endef
 
 # ADD_TARGET_RULE.la - Build a ".la" target.
@@ -238,6 +238,10 @@ define ADD_LOCAL_RULE.exe
     $(DIR)/: ${1}
 endef
 
+define ADD_LOCAL_RULE.js
+${ADD_LOCAL_RULE.exe}
+endef
+
 # ADD_LOCAL_RULE.la - Parametric "function" that adds a rule to build
 #   a local version of the target.
 #