change mmalloc.h into a public header

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 8306675..9cbfb14 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -169,7 +169,23 @@ XBT_SRC=\
   \
   xbt/config.c                                                               \
   xbt/cunit.c                                                                \
-  xbt/graphxml_parse.c
+  xbt/graphxml_parse.c                                                       \
+  xbt/setset.c                                                               \
+  xbt/mmalloc/mm.c
+
+#### mmalloc cruft -- to be integrated into cmake
+
+EXTRA_DIST+= \
+  xbt/mmalloc/keys.c      xbt/mmalloc/mmalloc.c  \
+  xbt/mmalloc/mm.c        xbt/mmalloc/mmprivate.h xbt/mmalloc/mrealloc.c \
+  xbt/mmalloc/attach.c    xbt/mmalloc/mcalloc.c  \
+  xbt/mmalloc/mmcheck.c   xbt/mmalloc/mmstats.c   xbt/mmalloc/mvalloc.c  \
+  xbt/mmalloc/detach.c    xbt/mmalloc/mfree.c     xbt/mmalloc/mmap-sup.c \
+  xbt/mmalloc/mmemalign.c xbt/mmalloc/mmtrace.c   xbt/mmalloc/sbrk-sup.c
+
+# info_TEXINFOS= xbt/mmalloc/mmalloc.texi
+
+### End of mmalloc cruft
 
 XBT_RL_SRC = \
   xbt/xbt_rl_synchro.c         \
@@ -190,7 +206,7 @@ SURF_SRC= \
   surf/random_mgr.c                                                          \
   surf/surf.c                                                                \
   surf/surfxml_parse.c                                                       \
-  surf/cpu.c   surf/network.c surf/network_constant.c surf/workstation.c     \
+  surf/cpu.c   surf/network.c surf/network_constant.c surf/network_vivaldi.c surf/workstation.c     \
   surf/surf_model_timer.c                                                    \
   surf/workstation_ptask_L07.c                                               \
   surf/cpu_ti.c                                               \
@@ -212,8 +228,19 @@ SIMIX_SRC= \
   simix/smx_context.c \
   simix/smx_action.c \
   simix/smx_synchro.c \
-  simix/smx_network.c
-  
+  simix/smx_network.c \
+  simix/smx_context_base.c
+
+TRACING_SRC=\
+  instr/interface.c \
+  instr/general.c \
+  instr/paje.c \
+  instr/msg_task_instr.c \
+  instr/msg_process_instr.c \
+  instr/smx_instr.c \
+  instr/surf_instr.c \
+  instr/variables_instr.c
+
 if CONTEXT_THREADS
   SURF_SRC += xbt/xbt_os_thread.c simix/smx_context_thread.c
   EXTRA_DIST += simix/smx_context_sysv.c
@@ -256,6 +283,7 @@ JMSG_JAVA_SRC = \
   java/simgrid/msg/NativeException.java              \
   java/simgrid/msg/HostNotFoundException.java        \
   java/simgrid/msg/ProcessNotFoundException.java     \
+  java/simgrid/msg/TaskCancelledException.java       \
   \
   java/simgrid/msg/Msg.java                          \
   java/simgrid/msg/Process.java                      \
@@ -337,7 +365,8 @@ lib_LTLIBRARIES= libsimgrid.la libgras.la libsmpi.la
 gras_sources=$(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC)
 simgrid_sources=$(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) \
                 $(SIMIX_SRC) $(MSG_SRC) $(SIMDAG_SRC) \
-               $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
+               $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) \
+               $(TRACING_SRC)
 
 
 libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm 
@@ -359,10 +388,10 @@ simgrid_ruby_la_SOURCES = bindings/ruby/simgrid_ruby.c
 simgrid_ruby_la_LDFLAGS = $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm -module
 endif
 
-# Windows users (at least, MSVC ones) need a def file.
+# Windows users (at least, MSVC ones) need a def file. (and JNI dont like @ cruft added to symbols)
 if IS_WINDOWS
 libgras_la_LDFLAGS    += -Wl,--output-def,libgras.def
-libsimgrid_la_LDFLAGS += -Wl,--output-def,libsimgrid.def
+libsimgrid_la_LDFLAGS += -Wl,--output-def,libsimgrid.def -Wl,--kill-at
 libsmpi_la_LDFLAGS    += -Wl,--output-def,libsmpi.def
 endif
 
@@ -386,7 +415,7 @@ simgrid.jar: $(JMSG_JAVA_SRC)
        [ -e .classes/surf ] || mkdir .classes/surf
        $(JAR) cvf simgrid.jar -C .classes .
 else
-EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC)
+EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC) $(TRACING_SRC)
 endif
 
 LUA_SRC= simix/smx_context_lua.c bindings/lua/simgrid_lua.c #bindings/lua/Msglua.c