From: mquinson Date: Thu, 22 Jul 2004 05:51:02 +0000 (+0000) Subject: Make a proper gras/ directory in the include one, and stop fooling with recursive... X-Git-Tag: v3.3~5031 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1e32d1f72606b96bb1abd9af359f1590528ec843?hp=ebd3066b86ef358bce0557c175febcd8ed6fdefc Make a proper gras/ directory in the include one, and stop fooling with recursive symbolic link. Ease the Makefiles git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@317 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/ChangeLog b/ChangeLog index 014dc75a6a..56aa9346aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ - Some documentation cleanups - remove the useless last argument of msgtype_declare - rename the Virtu functions to fit into the 'os' namespace + - move headers src/include -> src/include/gras/ and stop fooling with + gras -> . symbolic link 2004-07-19 Martin Quinson Version 0.1.1 diff --git a/configure.ac b/configure.ac index 67020d0acc..6410e43de3 100644 --- a/configure.ac +++ b/configure.ac @@ -105,7 +105,7 @@ AC_CONFIG_FILES([ src/examples/ping/Makefile doc/Makefile tools/compile-remote-worker -],[( cd src/include ; test -e gras || ln -s . gras ) +],[ test -e src/base/Tests/trp_tcp_usage && chmod +x src/base/Tests/trp_tcp_usage; test -e src/base/Tests/trp_file_usage && chmod +x src/base/Tests/trp_file_usage; test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests; diff --git a/include/Makefile.am b/include/Makefile.am index d8057439d7..44c241a917 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,14 +1,15 @@ SUBDIRS=modules -EXTRA_DIST= \ - gras.h \ - log.h error.h \ - module.h \ - dynar.h dict.h set.h \ - config.h \ +include_HEADERS = gras.h +nobase_include_HEADERS = \ + gras/log.h gras/error.h \ + gras/module.h \ + gras/dynar.h gras/dict.h gras/set.h \ + gras/config.h \ \ - datadesc.h transport.h virtu.h cond.h process.h \ + gras/datadesc.h gras/transport.h \ + gras/virtu.h gras/cond.h gras/process.h \ \ - messages.h \ + gras/messages.h \ \ - core.h -DISTCLEANFILES = gras + gras/core.h + diff --git a/include/cond.h b/include/gras/cond.h similarity index 100% rename from include/cond.h rename to include/gras/cond.h diff --git a/include/config.h b/include/gras/config.h similarity index 100% rename from include/config.h rename to include/gras/config.h diff --git a/include/core.h b/include/gras/core.h similarity index 100% rename from include/core.h rename to include/gras/core.h diff --git a/include/datadesc.h b/include/gras/datadesc.h similarity index 100% rename from include/datadesc.h rename to include/gras/datadesc.h diff --git a/include/dict.h b/include/gras/dict.h similarity index 100% rename from include/dict.h rename to include/gras/dict.h diff --git a/include/dynar.h b/include/gras/dynar.h similarity index 100% rename from include/dynar.h rename to include/gras/dynar.h diff --git a/include/error.h b/include/gras/error.h similarity index 100% rename from include/error.h rename to include/gras/error.h diff --git a/include/log.h b/include/gras/log.h similarity index 100% rename from include/log.h rename to include/gras/log.h diff --git a/include/messages.h b/include/gras/messages.h similarity index 100% rename from include/messages.h rename to include/gras/messages.h diff --git a/include/module.h b/include/gras/module.h similarity index 100% rename from include/module.h rename to include/gras/module.h diff --git a/include/process.h b/include/gras/process.h similarity index 100% rename from include/process.h rename to include/gras/process.h diff --git a/include/set.h b/include/gras/set.h similarity index 100% rename from include/set.h rename to include/gras/set.h diff --git a/include/transport.h b/include/gras/transport.h similarity index 100% rename from include/transport.h rename to include/gras/transport.h diff --git a/include/virtu.h b/include/gras/virtu.h similarity index 100% rename from include/virtu.h rename to include/gras/virtu.h