ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-15 01:58:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Improve make procedure (add aclocal flags)

Browse Source
This commit is contained in:
vsr 2009-04-15 13:33:51 +00:00
parent a831b10813
commit ca6257883d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.am
View File

@ -26,6 +26,15 @@
# #
include $(top_srcdir)/adm_local/unix/make_common_starter.am include $(top_srcdir)/adm_local/unix/make_common_starter.am
if GEOM_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
else !GEOM_ENABLE_GUI
ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
-I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
endif
SUBDIRS = idl adm_local resources src doc bin SUBDIRS = idl adm_local resources src doc bin
DIST_SUBDIRS = idl adm_local resources src doc bin DIST_SUBDIRS = idl adm_local resources src doc bin

4
build_configure
View File

@ -104,8 +104,8 @@ echo "====================================================== aclocal"
if test ${GEOM_WITH_GUI} = yes; then if test ${GEOM_WITH_GUI} = yes; then
aclocal -I adm_local/unix/config_files \ 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 ${GUI_ROOT_DIR}/adm_local/unix/config_files || exit 1 -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1
else else
aclocal -I adm_local/unix/config_files \ aclocal -I adm_local/unix/config_files \
-I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1 -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1