From 8614c61727a503806d5fad9beaa077e301d13a85 Mon Sep 17 00:00:00 2001
From: caremoli <caremoli>
Date: Mon, 14 Sep 2009 08:34:16 +0000
Subject: [PATCH] CCAR: remove duplicate variables (OMNIORB_IDL and IDL,
 OMNIORB_IDLCXXFLAGS and IDLCXXFLAGS, ...)

---
 idl/Makefile.am | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/idl/Makefile.am b/idl/Makefile.am
index bc2535a66..556ebe1b1 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -239,39 +239,36 @@ libSalomeParallelIDLKernel_la_LDFLAGS = -no-undefined -version-info=0:0:0
 libSalomeParallelIDLKernel_la_LIBADD  = libSalomeIDLKernel.la @PACO_LIBS@
 
 # These variables defines the building process of CORBA files
-OMNIORB_IDL         = @OMNIORB_IDL@
-OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
-OMNIORB_IDLPYFLAGS  = @OMNIORB_IDLPYFLAGS@
-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -Wba -I$(srcdir) -I$(top_builddir)/salome/idl
+IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(srcdir) -I$(top_builddir)/salome/idl
 IDLPYFLAGS  = @IDLPYFLAGS@ -I$(srcdir)
 
 # potential problem on parallel make on the following - multiple outputs
 SUFFIXES = .idl .hh SK.cc
 .idlSK.cc:
-	$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
+	$(IDL) $(IDLCXXFLAGS) $<
 SK.cc.hh:
 
 #Dummy rule to replace the following one (for parallel make)
 #.idl.hh:
-#	$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
+#	$(IDL) $(IDLCXXFLAGS) $<
 
 if WITH_PACO_PARALLEL
 
 %PaCO.idl %PaCO.hxx %PaCO.cxx : %.idl %.xml
-	$(OMNIORB_IDL) -p@PACOPATH@/lib/python -bpaco -Wb$(top_srcdir)/idl/$*.xml,$(srcdir):@PACOPATH@/idl $(top_srcdir)/idl/$*.idl
+	$(IDL) -p@PACOPATH@/lib/python -bpaco -Wb$(top_srcdir)/idl/$*.xml,$(srcdir):@PACOPATH@/idl $(top_srcdir)/idl/$*.idl
 
 .idl.hxx:
-	$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) -Wbh=.hxx -Wbs=.cxx $<
+	$(IDL) $(IDLCXXFLAGS) -Wbh=.hxx -Wbs=.cxx $<
 endif
 
 install-exec-local: $(IDL_FILES:%=$(top_srcdir)/idl/%) Calcium_Ports.idl
 	$(INSTALL) -d  $(DESTDIR)$(salomepythondir)
 	ls $^ | while read file; do \
-	  $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \
+	  $(IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \
 	done
 if WITH_PACO_PARALLEL
 	ls $(top_builddir)/idl/*.idl | while read file; do \
-	  $(OMNIORB_IDL) $(IDLPYFLAGS) -I$(top_srcdir)/idl -I@PACOPATH@/idl -C$(DESTDIR)$(salomepythondir) $$file ; \
+	  $(IDL) $(IDLPYFLAGS) -I$(top_srcdir)/idl -I@PACOPATH@/idl -C$(DESTDIR)$(salomepythondir) $$file ; \
 	done
 endif
 
-- 
2.39.2