From: vsr <vsr@opencascade.com>
Date: Thu, 16 Apr 2009 04:20:09 +0000 (+0000)
Subject: Improve make procedure (add aclocal flags)
X-Git-Tag: V4_1_5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bf1caa80e1805efc894ae85faf69a55bc5d95e5a;p=plugins%2Fnetgenplugin.git

Improve make procedure (add aclocal flags)
---

diff --git a/Makefile.am b/Makefile.am
index b95b139..13377c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,21 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
+if NETGENPLUGIN_ENABLE_GUI
+  ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
+                    -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
+                    -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
+                    -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
+                    -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
+                    -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
+else !NETGENPLUGIN_ENABLE_GUI
+  ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
+                    -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
+                    -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
+                    -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
+                    -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
+endif
+
 SUBDIRS = idl adm_local resources src bin
 
 DIST_SUBDIRS = idl adm_local resources src bin 
diff --git a/build_configure b/build_configure
index 4e3b7e4..0e97239 100755
--- a/build_configure
+++ b/build_configure
@@ -131,8 +131,8 @@ echo "====================================================== aclocal"
 
 if test ${NETGENPLUGIN_WITH_GUI} = yes; then
   aclocal -I adm_local/unix/config_files \
-          -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
           -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
+          -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
           -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
           -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
           -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files || exit 1