resolve merge conflict

[simgrid.git] / buildtools / Cmake / DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 50cfb56..ec1a1f0 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -16,7 +16,6 @@ set(EXTRA_DIST
        src/xbt/backtrace_windows.c
        src/xbt/backtrace_dummy.c
        src/xbt/setset_private.h
-       src/xbt/automatonparse_promela.c
        src/xbt/mmalloc/mfree.c
        src/xbt/mmalloc/mmalloc.c
        src/xbt/mmalloc/mmalloc.info
@@ -85,6 +84,7 @@ set(EXTRA_DIST
        src/smpi/README
        src/mk_supernovae.pl
        
+
        tools/gras/gras_stub_generator.h
        tools/tesh/run_context.h  
        tools/tesh/tesh.h
@@ -169,7 +169,11 @@ set(XBT_SRC
        src/xbt/parmap.c
        src/xbt/xbt_replay.c
        src/xbt/lib.c
-       src/xbt/automaton.c
+       src/xbt/automaton/automaton.c
+       src/xbt/automaton/automatonparse_promela.c
+       src/xbt/automaton/automaton.c
+       src/xbt/automaton/automatonparse_promela.c
+       src/xbt/automaton/automaton_create.c
        src/xbt/datadesc/ddt_create.c
        src/xbt/datadesc/ddt_convert.c
        src/xbt/datadesc/ddt_exchange.c
@@ -386,6 +390,8 @@ set(headers_to_install
        include/xbt/hash.h
        include/xbt/function_types.h
        include/xbt/asserts.h 
+       include/xbt/automaton.h
+       include/xbt/automatonparse_promela.h
        include/xbt/ex.h
        include/xbt/log.h
        include/xbt/module.h
@@ -412,8 +418,6 @@ set(headers_to_install
        include/xbt/mmalloc.h
        include/xbt/replay.h
        include/xbt/parmap.h
-       include/xbt/automaton.h
-       include/xbt/automatonparse_promela.h
        include/xbt/datadesc.h
        include/xbt/socket.h
        include/xbt/file_stat.h