Remove compilation warning

[modules/smesh.git] / idl / Makefile.am

diff --git a/idl/Makefile.am b/idl/Makefile.am
index 84d91680203dbd86ba300b1afd4989330d3e6235..99950b821e3c4f5091c739657b45cb8b16068c95 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -36,10 +36,8 @@ BASEIDL_FILES = \
        SMESH_Pattern.idl \
        SMESH_MeshEditor.idl
 
-EXTRA_DIST+= $(BASEIDL_FILES)
-
 # This variable defines the files to be installed
-salomeidl_DATA = $(BASEIDL_FILES)
+dist_salomeidl_DATA = $(BASEIDL_FILES)
 
 # GUI idl common library
 lib_LTLIBRARIES = libSalomeIDLSMESH.la
@@ -56,20 +54,18 @@ nodist_libSalomeIDLSMESH_la_SOURCES = \
        SMESH_MeshEditorSK.cc
 
 # header files must be exported: other modules have to use this library
-nodist_salomeinclude_HEADERS= $(BASEIDL_FILES:%.idl=%.hh)
-
-libSalomeIDLSMESH_la_CPPFLAGS =\
-       -I$(top_builddir)/salome_adm/unix \
-       -I$(top_builddir)/idl \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       $(KERNEL_CXXFLAGS) \
-       $(MED_CXXFLAGS) \
+nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
+
+libSalomeIDLSMESH_la_CPPFLAGS =                        \
+       -I$(top_builddir)/salome_adm/unix       \
+       -I$(top_builddir)/idl                   \
+       $(CORBA_CXXFLAGS) $(CORBA_INCLUDES)     \
+       $(KERNEL_CXXFLAGS) $(MED_CXXFLAGS)      \
        $(GEOM_CXXFLAGS)
 libSalomeIDLSMESH_la_LDFLAGS = -no-undefined -version-info=0:0:0
-libSalomeIDLSMESH_la_LIBADD  = \
-       @CORBA_LIBS@ \
-       $(MED_LDFLAGS) -lSalomeIDLMED \
+libSalomeIDLSMESH_la_LIBADD  =         \
+       @CORBA_LIBS@                    \
+       $(MED_LDFLAGS) -lSalomeIDLMED   \
        $(GEOM_LDFLAGS) -lSalomeIDLGEOM
 
 # These variables defines the building process of CORBA files
@@ -105,14 +101,14 @@ SUFFIXES = .idl .hh SK.cc
        $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
 
 install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%)
-       $(INSTALL) -d  $(pkgpythondir)
+       $(INSTALL) -d  $(DESTDIR)$(salomepythondir)
        ls $^ | while read file; do \
-         $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(pkgpythondir) $$file ; \
+         $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \
        done
 
 # uninstall-local removes too much, but it works in distcheck
 uninstall-local:
-       rm -rf $(pkgpythondir)/*
+       rm -rf $(DESTDIR)$(salomepythondir)/*
 
 mostlyclean-local:
        -rm -f *.hh *.cc .depidl