Merge from V6_main 13/12/2012

[modules/med.git] / adm_local / unix / make_common_starter.am

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 6d704892baceb1760489003a3826aeb2e99cf1e3..2912e8cb36f1155321de2dd75d23f729c2b3d526 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -30,6 +30,11 @@ else !MED_ENABLE_KERNEL
   AM_CPPFLAGS = -I$(top_builddir)/adm_local_without_kernel -include SALOMEconfig.h
 endif
 
+# ============================================================
+# Cmake files wildcard (to add then to the distribution)
+# ============================================================
+CMAKEFILES    = $(notdir $(wildcard $(srcdir)/CMakeLists.txt))
+
 # ============================================================
 # This file defines the common definitions used in several
 # Makefile. This file must be included, if needed, by the file
@@ -66,7 +71,7 @@ sharedpkgpythondir = $(salomepythondir)/shared_modules
 # Documentation directory
 docdir             = $(datadir)/doc/salome
 
-EXTRA_DIST =
+EXTRA_DIST         = $(CMAKEFILES)
 
 # tests
 tests: unittest
@@ -88,9 +93,3 @@ unittest: $(UNIT_TEST_PROG)
                fi; \
            done; \
        fi;
-
-# documentation
-html-local: $(DOX_INPUT_FILE)
-       @if test "x$(DOX_INPUT_FILE)" != "x"; then \
-           doxygen $(DOX_INPUT_FILE);             \
-       fi;