Merge over into the trunk.

[tinyos-2.x.git] / support / make / sim-fast.extra

diff --git a/support/make/sim-fast.extra b/support/make/sim-fast.extra
index 5912fa51b20a7db6428c2dc6cb124a40974a1289..474f8eb211671f772c09aa2465c6947fb7e3d6a7 100644 (file)
--- a/support/make/sim-fast.extra
+++ b/support/make/sim-fast.extra
@@ -14,6 +14,8 @@ CFILE    = $(BUILDDIR)/sim.c
 OBJFILE    = $(BUILDDIR)/sim.o
 CXXFILE    = $(TOSDIR)/lib/tossim/tossim.c
 CXXOBJFILE = $(BUILDDIR)/tossim.o
+HASHFILE    = $(TOSDIR)/lib/tossim/hashtable.c
+HASHOBJFILE = $(BUILDDIR)/c-support.o
 PYFILE     = $(TOSDIR)/lib/tossim/tossim_wrap.cxx
 PYOBJFILE  = $(BUILDDIR)/pytossim.o
 PYDIR      =/usr/include/python$(PYTHON_VERSION)
@@ -51,10 +53,10 @@ sim-exe: builddir $(BUILD_EXTRA_DEPS) FORCE
        @echo "  writing XML schema to $(XML)"
        @echo "  compiling $(COMPONENT) to object file sim.o"
        $(NCC) -c $(PLATFORM_FLAGS) -o $(OBJFILE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WFLAGS) $(COMPONENT).nc $(LDFLAGS)  $(DUMPTYPES) -fnesc-dumpfile=$(XML)
-
-       @echo "  compiling Python support into pytossim.o and tossim.o"
+       @echo "  compiling Python support and C libraries into pytossim.o, tossim.o, and c-support.o"
        $(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(PYOBJFILE) $(OPTFLAGS) $(CFLAGS) $(PYFILE) -I$(PYDIR) -I$(SIMDIR) -DHAVE_CONFIG_H 
        $(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(CXXOBJFILE) $(OPTFLAGS) $(CFLAGS) $(CXXFILE) -I$(PYDIR) -I$(SIMDIR)
+       $(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(HASHOBJFILE) $(OPTFLAGS) $(CFLAGS) $(HASHFILE) -I$(PYDIR) -I$(SIMDIR)
        @echo "  linking into shared object ./$(SHARED_OBJECT)"
        $(GPP) $(PLATFORM_BUILD_FLAGS) $(PLATFORM_CC_FLAGS) $(PYOBJFILE) $(OBJFILE) $(CXXOBJFILE) $(PLATFORM_LIB_FLAGS) -o $(SHARED_OBJECT)
        @echo "  copying Python script interface TOSSIM.py from lib/tossim to local directory"