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
Ok, amok tests do fail. I know that, but I'm sick of delaying the release for that...
[simgrid.git]
/
examples
/
amok
/
Makefile.in
diff --git
a/examples/amok/Makefile.in
b/examples/amok/Makefile.in
index
f4ed054
..
6db7a36
100644
(file)
--- a/
examples/amok/Makefile.in
+++ b/
examples/amok/Makefile.in
@@
-1,8
+1,8
@@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10
.1
from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006
, 2007, 2008
Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@
-103,7
+103,7
@@
am_saturate_saturate_simulator_OBJECTS = saturate.$(OBJEXT) \
saturate_saturate_simulator_OBJECTS = \
$(am_saturate_saturate_simulator_OBJECTS)
saturate_saturate_simulator_DEPENDENCIES = $(LDADD_SG)
saturate_saturate_simulator_OBJECTS = \
$(am_saturate_saturate_simulator_OBJECTS)
saturate_saturate_simulator_DEPENDENCIES = $(LDADD_SG)
-DEFAULT_INCLUDES = -I.
-I$(top_builddir)/src@am__isrc@
+DEFAULT_INCLUDES = -I.
@am__isrc@ -I$(top_builddir)/src
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@
-155,6
+155,7
@@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOXYGEN = @DOXYGEN@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@
-187,8
+188,8
@@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MD5SUM = @MD5SUM@
MKDIR_P = @MKDIR_P@
MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@@
-276,11
+277,15
@@
AM_CFLAGS = -g
###################
# saturate tests #
###################
###################
# saturate tests #
###################
-EXTRA_DIST = bandwidth/bandwidth.xml saturate/saturate.xml
+
+#########
+# Cruft #
+#########
+EXTRA_DIST = bandwidth/bandwidth.xml saturate/saturate.xml $(TESTS)
TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
TESTS = $(am__append_1) $(am__append_2) $(am__append_3) \
$(am__append_4)
TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
TESTS = $(am__append_1) $(am__append_2) $(am__append_3) \
$(am__append_4)
-XFAIL_TESTS =
+XFAIL_TESTS =
$(TESTS)
LDADD_SG = $(top_builddir)/src/libsimgrid.la
LDADD_RL = $(top_builddir)/src/libgras.la
bandwidth_bandwidth_simulator_SOURCES = bandwidth/bandwidth.c bandwidth/_bandwidth_simulator.c
LDADD_SG = $(top_builddir)/src/libsimgrid.la
LDADD_RL = $(top_builddir)/src/libgras.la
bandwidth_bandwidth_simulator_SOURCES = bandwidth/bandwidth.c bandwidth/_bandwidth_simulator.c
@@
-513,14
+518,16
@@
mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
clean-libtool:
-rm -rf .libs _libs
+ -rm -rf bandwidth/.libs bandwidth/_libs
+ -rm -rf saturate/.libs saturate/_libs
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '
{ files[$$0]
= 1; } \
-
END { for (i in files) print i
; }'`; \
+ $(AWK) '
{ files[$$0] = 1; nonemtpy
= 1; } \
+
END { if (nonempty) { for (i in files) print i; }
; }'`; \
mkid -fID $$unique
tags: TAGS
mkid -fID $$unique
tags: TAGS
@@
-532,8
+539,8
@@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '
{ files[$$0]
= 1; } \
-
END { for (i in files) print i
; }'`; \
+ $(AWK) '
{ files[$$0] = 1; nonempty
= 1; } \
+
END { if (nonempty) { for (i in files) print i; }
; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@
-543,13
+550,12
@@
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '
{ files[$$0]
= 1; } \
-
END { for (i in files) print i
; }'`; \
+ $(AWK) '
{ files[$$0] = 1; nonempty
= 1; } \
+
END { if (nonempty) { for (i in files) print i; }
; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@
-770,20
+776,16
@@
uninstall-am:
# Take care of generatated sources
bandwidth/_bandwidth_simulator.c bandwidth/_bandwidth_sensor.c bandwidth/_bandwidth_maestro.c : bandwidth/bandwidth.c bandwidth/bandwidth.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
# Take care of generatated sources
bandwidth/_bandwidth_simulator.c bandwidth/_bandwidth_sensor.c bandwidth/_bandwidth_maestro.c : bandwidth/bandwidth.c bandwidth/bandwidth.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
- cd bandwidth;
../$(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ bandwidth ../$(
top_srcdir)/examples/amok/bandwidth/bandwidth.xml
+ cd bandwidth;
$(abs_top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ bandwidth $(abs_
top_srcdir)/examples/amok/bandwidth/bandwidth.xml
# Take care of generatated sources
saturate/_saturate_simulator.c saturate/_saturate_sensor.c saturate/_saturate_maestro.c : saturate/saturate.c saturate/saturate.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
# Take care of generatated sources
saturate/_saturate_simulator.c saturate/_saturate_sensor.c saturate/_saturate_maestro.c : saturate/saturate.c saturate/saturate.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
- cd saturate;
../$(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ saturate ../$(
top_srcdir)/examples/amok/saturate/saturate.xml
+ cd saturate;
$(abs_top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ saturate $(abs_
top_srcdir)/examples/amok/saturate/saturate.xml
dist-files:
@for n in $(DISTFILES) ; do echo $(SRCFILE)$$n; done
@echo
@for n in $(DIST_SUBDIRS) ; do if [ x$$n != x. ] ; then $(MAKE) -C $$n dist-files SRCFILE=$(SRCFILE)$$n/ ; fi; done
dist-files:
@for n in $(DISTFILES) ; do echo $(SRCFILE)$$n; done
@echo
@for n in $(DIST_SUBDIRS) ; do if [ x$$n != x. ] ; then $(MAKE) -C $$n dist-files SRCFILE=$(SRCFILE)$$n/ ; fi; done
-
-#########
-# Cruft #
-#########
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: