NRI : Restore SALOMEconfig.h instead of GEOMconfig.h.

This commit is contained in:
nri 2003-05-28 16:22:04 +00:00
parent 5a6ba16ded
commit 219f414404
3 changed files with 4 additions and 10 deletions

View File

@ -128,14 +128,14 @@ VERSION
# copy header files in common directory # copy header files in common directory
ifeq ($(HAVE_SSTREAM),yes) ifeq ($(HAVE_SSTREAM),yes)
include_list=include/salome/GEOMconfig.h include_list=include/salome/SALOMEconfig.h
else else
include_list=include/salome/GEOMconfig.h include/salome/sstream include_list=include/salome/SALOMEconfig.h include/salome/sstream
endif endif
inc: idl $(include_list) inc: idl $(include_list)
include/salome/GEOMconfig.h: adm_local/unix/GEOMconfig.h include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.h
-$(RM) $@ -$(RM) $@
$(LN_S) ../../$< $@ $(LN_S) ../../$< $@

View File

@ -1,6 +0,0 @@
#define DEBUG
#define QUOTE(x) #x
#define CORBA_CLIENT_HEADER(x) QUOTE(x@IDL_CLN_H@)
#define CORBA_SERVER_HEADER(x) QUOTE(x@IDL_SRV_H@)

View File

@ -120,7 +120,7 @@ echo "AC_OUTPUT([ \\" >> configure.in_tmp1
# put them "manually" # put them "manually"
# #
echo " ./adm_local/unix/GEOMconfig.h \\" >> configure.in_tmp1 echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1
echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1
echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1
echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1