From 629198525e7d58462b701bff8bdbccda91c1e6cb Mon Sep 17 00:00:00 2001 From: prascle Date: Wed, 1 Feb 2006 19:48:45 +0000 Subject: [PATCH] PR: to allow GUI compilation --- configure.ac | 6 +++--- salome_adm/unix/Makefile.am | 1 + salome_adm/unix/make_conclude.in | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index daf82ade0..62eb70683 100644 --- a/configure.ac +++ b/configure.ac @@ -227,11 +227,11 @@ DEFAULT_ORB=omniORB echo DEFAULT_ORB : $DEFAULT_ORB CHECK_CORBA -CORBA_RULES=salome_adm/unix/make_$ORB -AC_SUBST_FILE(CORBA_RULES) +CORBA=salome_adm/unix/make_$ORB +AC_SUBST_FILE(CORBA) # _CS_gbo: -# The CORBA_RULES variable defines the file name that +# The CORBA variable defines the file name that # implements the building rules to be included by Makefile to process # idl files and CORBA specific dependencies (ex: the file # salome_adm/unix/make_omniorb is the default for SALOME). The value diff --git a/salome_adm/unix/Makefile.am b/salome_adm/unix/Makefile.am index 45dec69e5..836b487ee 100644 --- a/salome_adm/unix/Makefile.am +++ b/salome_adm/unix/Makefile.am @@ -15,4 +15,5 @@ salomeadmux_DATA=\ make_conclude.in \ make_module.in \ make_omniorb.in \ + pythonbe.py \ $(DEPRECATED_FILES) diff --git a/salome_adm/unix/make_conclude.in b/salome_adm/unix/make_conclude.in index ee4ec67a1..adce12a21 100644 --- a/salome_adm/unix/make_conclude.in +++ b/salome_adm/unix/make_conclude.in @@ -11,7 +11,7 @@ # # ORB Specifics rules -@CORBA_RULES@ +@CORBA@ # transform idl reference in appropriate obj file LIB_CLIENT_SRC = $(LIB_CLIENT_IDL:%.idl=%$(IDL_CLN_CXX)) -- 2.39.2