From: crouzet <crouzet>
Date: Mon, 11 Feb 2008 16:08:36 +0000 (+0000)
Subject: correction bug issue 128 : compilation without -g (GUI) option
X-Git-Tag: V4_1_1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7d0a7b912a6fac3f4916b821fcdd5a0c1f3a92da;p=tools%2Fhxx2salome.git

correction bug issue 128 : compilation without -g (GUI) option
---

diff --git a/scripts/hxx2salome b/scripts/hxx2salome
index d533e12..c8a7507 100755
--- a/scripts/hxx2salome
+++ b/scripts/hxx2salome
@@ -35,7 +35,7 @@ usage()
     echo -e "    -g                    : to create a gui part in your component building tree"
     echo -e "    -c                    : to compile after generation"
     echo -e "                            (use this option only if you don't have dependencies in your header or libraries"
-    echo -e "                             if it is the case, you'll have to adapt your Makefile.in" 
+    echo -e "                             if it is the case, you'll have to adapt your Makefile.am" 
     echo -e "    -l                    : to launch salome "
     exit
 }
@@ -199,8 +199,10 @@ generate_module_source()
     then
     	echo -e "\n-> Delete GUI part from the tree" >> hxx2salome_journal
     	'rm' -rf ${CLASS_NAME}_SRC/src/${CLASS_NAME}GUI
-	sed "s/${CLASS_NAME}GUI//" < ${CLASS_NAME}_SRC/src/Makefile.in > /tmp/h2smkf.$$
-	mv /tmp/h2smkf.$$ ${CLASS_NAME}_SRC/src/Makefile.in
+	sed "s/${CLASS_NAME}GUI//" < ${CLASS_NAME}_SRC/src/Makefile.am > /tmp/h2smkf.$$
+	mv /tmp/h2smkf.$$ ${CLASS_NAME}_SRC/src/Makefile.am
+	cat ${CLASS_NAME}_SRC/configure.ac | awk ' $0 !~ "^.*GUI/Makefile"  { print $0}' > /tmp/h2scac.$$
+	mv /tmp/h2scac.$$  ${CLASS_NAME}_SRC/configure.ac
     fi
 #
     echo -e "\n-> Substitute generated code in idl file"
@@ -229,7 +231,7 @@ generate_module_source()
     get_python_test_file
     get_info_makefile
     
-    echo -e "\n-> Substitute flags in Makefile.in"
+    echo -e "\n-> Substitute flags in Makefile.am"
     sed "s?HXX2SALOME_INCLUDE?${makefile_include}?g
          s?HXX2SALOME_PYTHON_FILE?${python_test_file}?g
          s?HXX2SALOME_LIB?${makefile_lib}?g
@@ -364,9 +366,9 @@ good_bye()
     echo -e "\t\tby editing your own per-user configuration file ~/.SalomeApprc.3.x.x)"
     echo -e "\nIf the header of your component includes other headers that are not in the same directories,"
     echo -e "or if your library has dependencies you want to specify,"
-    echo -e "you'll have to modify the following files Makefile.in: "
-    echo -e "\t\${${CLASS_NAME}_SRC_DIR}/src/${CLASS_NAME}/Makefile.in"
-    echo -e "\t\${${CLASS_NAME}_SRC_DIR}/src/${CLASS_NAME}GUI/Makefile.in"
+    echo -e "you'll have to modify the following files Makefile.am: "
+    echo -e "\t\${${CLASS_NAME}_SRC_DIR}/src/${CLASS_NAME}/Makefile.am"
+    echo -e "\t\${${CLASS_NAME}_SRC_DIR}/src/${CLASS_NAME}GUI/Makefile.am"
 }
 
 launch_salome()