Fix copyright headers

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index e2bc59d..120033f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -91,7 +91,9 @@ EXTRA_DIST= \
       smpi/smpi_mpi_dt_private.h \
        smpi/README \
        \
-       mk_supernovae.sh
+       mk_supernovae.sh \
+       \
+       bindings/ruby_bindings.h 
 
 #LIBRARY_VERSION= 0:0:0
 #                 | | |
@@ -210,8 +212,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
@@ -254,6 +267,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                      \
@@ -330,18 +344,13 @@ endif
 ### Declare the library content
 ###
 
-if HAVE_RUBY
-  libruby=simgrid_ruby.la
-else
-  libruby=
-endif
-
-lib_LTLIBRARIES= libsimgrid.la libgras.la libsmpi.la $(libruby)
+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 
@@ -357,6 +366,7 @@ libsmpi_la_SOURCES = $(SMPI_SRC)
 libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm
 
 if HAVE_RUBY
+lib_LTLIBRARIES += simgrid_ruby.la
 simgrid_ruby_la_LIBADD = libsimgrid.la
 simgrid_ruby_la_SOURCES = bindings/ruby/simgrid_ruby.c
 simgrid_ruby_la_LDFLAGS = $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm -module
@@ -389,10 +399,10 @@ 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/Msglua.c
+LUA_SRC= simix/smx_context_lua.c bindings/lua/simgrid_lua.c #bindings/lua/Msglua.c 
 if HAVE_LUA
   simgrid_sources += $(LUA_SRC)
 else