From 5cd8ed66e701006428a404d58ac1c7a2492d06b3 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 16 Apr 2009 04:16:12 +0000 Subject: [PATCH] Improve make procedure (add aclocal flags) --- Makefile.am | 14 ++++++++++++++ build_configure | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index e8f2219..5f6e048 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,20 @@ # include $(top_srcdir)/adm_local/unix/make_common_starter.am +if GHS3DPLUGIN_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 !GHS3DPLUGIN_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 diff --git a/build_configure b/build_configure index 574aa92..5fb84d9 100755 --- a/build_configure +++ b/build_configure @@ -124,8 +124,8 @@ echo "====================================================== aclocal" if test ${GHS3DPLUGIN_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 -- 2.39.2