cleanup the mecanism in charge of declaring the library dependencies to libtool

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b68f89d..b39ca5f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,4 @@
-SUBDIRS=.  
-# amok not ported to GRAS NG yet
+SUBDIRS= . amok
 
 AM_CFLAGS= -g
 #AM_CFLAGS= -DNDEBUG 
@@ -17,16 +16,30 @@ MAINTAINERCLEANFILES=Makefile.in
 INCLUDES= -I$(top_srcdir)/include \
           @CFLAGS_SimGrid@
 EXTRA_DIST= \
-        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 \
+       \
        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
 #                 | | |
 #          +------+ | +---+
@@ -74,15 +87,27 @@ endif
 
 COMMON_S=\
   \
-  xbt/xbt_interface.h                                                         \
+  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                           \
+  \
+  gras/gras.c \
   \
   gras/Transport/transport.c          gras/Transport/transport_private.h   gras/Transport/transport_plugin_buf.c  \
   \
@@ -99,16 +124,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