A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add portable.h (headers to include to program in a portable manner, for internal...
[simgrid.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
8eda89f
..
3adaa72
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,5
+1,6
@@
-SUBDIRS=.
-# amok not ported to GRAS NG yet
+SUBDIRS= . amok
+
+AM_CFLAGS= -g
#AM_CFLAGS= -DNDEBUG
# -DNLOG cuts absolutely all logs at compilation time.
#AM_CFLAGS= -DNDEBUG
# -DNLOG cuts absolutely all logs at compilation time.
@@
-15,16
+16,29
@@
MAINTAINERCLEANFILES=Makefile.in
INCLUDES= -I$(top_srcdir)/include \
@CFLAGS_SimGrid@
EXTRA_DIST= \
INCLUDES= -I$(top_srcdir)/include \
@CFLAGS_SimGrid@
EXTRA_DIST= \
- gras_private.h\
\
\
- gros/dict_private.h \
+ portable.h \
+ \
+ xbt/dict_private.h \
+ xbt/heap_private.h \
+ xbt/fifo_private.h \
\
\
+ 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/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
# | | |
# +------+ | +---+
#LIBRARY_VERSION= 0:0:0
# | | |
# +------+ | +---+
@@
-72,15
+86,26
@@
endif
COMMON_S=\
\
COMMON_S=\
\
- gros/gros_interface.h \
- gros/sysdep.c \
- 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 \
- gros/module.c \
- gros/config.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 \
\
\
+ 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 \
\
\
gras/Transport/transport.c gras/Transport/transport_private.h gras/Transport/transport_plugin_buf.c \
\
@@
-97,11
+122,14
@@
COMMON_S=\
gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
@LEX@ -o$@ -Pgras_ddt_parse_ $^
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_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_WINSOCK_DEP@
if HAVE_SG
libgrassg_la_SOURCES= $(COMMON_S) \
if HAVE_SG
libgrassg_la_SOURCES= $(COMMON_S) \