making some field names more explicit (e.g. void * -> sim_data_task_t) even though...

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index ebcec55..03a5e47 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
-SUBDIRS=.  
-# amok not ported to GRAS NG yet
-AM_CFLAGS= -DNDEBUG 
+SUBDIRS= . amok
+
+AM_CFLAGS= -g
+#AM_CFLAGS= -DNDEBUG 
 
 # -DNLOG   cuts absolutely all logs at compilation time.
 # -DNDEBUG cuts asserts and logs at "trace" and "debug" levels.
@@ -12,18 +13,35 @@ AM_CFLAGS= -DNDEBUG
 
 
 MAINTAINERCLEANFILES=Makefile.in
-INCLUDES= -I$(top_srcdir)/src/include \
+INCLUDES= -I$(top_srcdir)/include \
           @CFLAGS_SimGrid@
 EXTRA_DIST= \
-        gros/dict_private.h \
         \
-        gras/gras_private.h    \
+       portable.h \
+       \
+        xbt/dict_private.h \
+        xbt/heap_private.h \
+        xbt/fifo_private.h \
+        xbt/context_private.h xbt/context_win32.h xbt/context_win32.c\
+        \
+       surf/maxmin_private.h \
+       surf/trace_mgr_private.h \
+       surf/surf_private.h \
+       surf/cpu_private.h \
+       surf/workstation_private.h \
+       surf/surf_parse.l surf/surf_parse.h \
+       surf/network_private.h \
+       \
+       msg/private.h \
+       \
        gras/Transport/transport_interface.h \
        gras/Virtu/virtu_interface.h \
        gras/Virtu/virtu_rl.h \
        gras/Virtu/virtu_sg.h \
        gras/DataDesc/ddt_parse.yy.l gras/DataDesc/ddt_parse.yy.c
 
+#        gras_private.h
+
 #LIBRARY_VERSION= 0:0:0
 #                 | | |
 #          +------+ | +---+
@@ -68,16 +86,32 @@ else
  lib_LTLIBRARIES= libgrasrl.la
 endif
 
-#  gros/config.c                               
 
 COMMON_S=\
   \
-  gros/module.c      gros/core_interface.h                                      \
-  gros/log.c         gros/log_default_appender.c   gros/error.c                 \
-  gros/dynar.c                                                                  \
-  gros/dict.c        gros/dict_elm.c               gros/dict_cursor.c           \
-  gros/set.c                                                                    \
+  xbt_modinter.h    gras_modinter.h                                            \
+  \
+  xbt/sysdep.c                                                                 \
+  xbt/log.c         xbt/log_default_appender.c   xbt/error.c                 \
+  xbt/dynar.c                                                                  \
+  xbt/dict.c        xbt/dict_elm.c               xbt/dict_cursor.c           \
+  xbt/heap.c                                                                    \
+  xbt/fifo.c                                                                    \
+  xbt/swag.c                                                                   \
+  xbt/set.c                                                                    \
+  xbt/module.c                                                                 \
+  xbt/config.c                                                                 \
+  xbt/context.c                                                                \
   \
+  surf/maxmin.c                                                              \
+  surf/trace_mgr.c                                                           \
+  surf/surf.c                                                                \
+  surf/surf_parse.c                                                          \
+  surf/cpu.c   surf/network.c   surf/workstation.c                           \
+  \
+  msg/task.c  \
+  \
+  gras/gras.c \
   \
   gras/Transport/transport.c          gras/Transport/transport_private.h   gras/Transport/transport_plugin_buf.c  \
   \
@@ -94,16 +128,19 @@ COMMON_S=\
 gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
        @LEX@ -o$@ -Pgras_ddt_parse_ $^
 
+surf/surf_parse.c: surf/surf_parse.l
+       @LEX@ -o$@ -Psurf_parse_ $^
+
 libgrasrl_la_SOURCES= $(COMMON_S) \
   gras/Transport/rl_transport.c  gras/Transport/transport_plugin_tcp.c  gras/Transport/transport_plugin_file.c      \
   \
   gras/Virtu/rl_process.c        gras/Virtu/rl_time.c                   gras/Virtu/rl_conditional.c
-libgrasrl_la_LDFLAGS = $(VERSION_INFO)
+libgrasrl_la_LDFLAGS = $(VERSION_INFO) @GRAS_RL_DEP@
 
 if HAVE_SG
   libgrassg_la_SOURCES= $(COMMON_S) \
     gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c             \
     \
     gras/Virtu/sg_process.c        gras/Virtu/sg_time.c                 gras/Virtu/sg_conditional.c
-  libgrassg_la_LDFLAGS = $(VERSION_INFO)
+  libgrassg_la_LDFLAGS = $(VERSION_INFO) @GRAS_SG_DEP@
 endif