ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-30 19:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix problem of make distcheck on automake 1.11 (Mandriva 2010):

Browse Source 
- we have to uninstall only the staff generated for idl files and nothing more
This commit is contained in:
vsr 2012-04-18 12:44:32 +00:00
parent b872ce66df
commit be503b1313
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
idl/Makefile.am
View File

@ -35,6 +35,8 @@ BASEIDL_FILES = \
SMESH_MeshEditor.idl \ SMESH_MeshEditor.idl \
SMESH_Measurements.idl SMESH_Measurements.idl
BASEIDL_FILES_PY=$(BASEIDL_FILES:%.idl=%_idl.py)
# This variable defines the files to be installed # This variable defines the files to be installed
dist_salomeidl_DATA = $(BASEIDL_FILES) dist_salomeidl_DATA = $(BASEIDL_FILES)
@ -108,9 +110,15 @@ install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%)
$(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \ $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \
done done
# uninstall-local removes too much, but it works in distcheck # we want to remove only staff generated for IDL files and nothing more
uninstall-local: uninstall-local:
rm -rf $(DESTDIR)$(salomepythondir)/* @for modulen in SMESH StdMeshers ; do \
test -d $(DESTDIR)$(salomepythondir)/$${modulen} && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen} ; \
test -d $(DESTDIR)$(salomepythondir)/$${modulen}__POA && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}__POA" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen}__POA ; \
done ; \
for filen in $(BASEIDL_FILES_PY) ; do \
echo "Removing $(DESTDIR)$(salomepythondir)/$${filen}" && rm -f $(DESTDIR)$(salomepythondir)/$${filen}* ; \
done
mostlyclean-local: mostlyclean-local:
-rm -f *.hh *.cc .depidl -rm -f *.hh *.cc .depidl

11
src/Tools/padder/meshjob/idl/Makefile.am
View File

@ -31,6 +31,8 @@ IDL_FILES = MESHJOB.idl
BUILT_SOURCES += SPADDERPluginTestSK.cc BUILT_SOURCES += SPADDERPluginTestSK.cc
IDL_FILES += SPADDERPluginTest.idl IDL_FILES += SPADDERPluginTest.idl
IDL_FILES_PY=$(IDL_FILES:%.idl=%_idl.py)
salomeidl_DATA = $(IDL_FILES) salomeidl_DATA = $(IDL_FILES)
lib_LTLIBRARIES = libSalomeIDLSPADDER.la lib_LTLIBRARIES = libSalomeIDLSPADDER.la
@ -81,6 +83,13 @@ install-data-local: $(IDL_FILES)
$(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \ $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \
done done
# we want to remove only staff generated for IDL files and nothing more
uninstall-local: uninstall-local:
rm -rf $(DESTDIR)$(salomepythondir)/* @for modulen in MESHJOB SPADDERPluginTest ; do \
test -d $(DESTDIR)$(salomepythondir)/$${modulen} && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen} ; \
test -d $(DESTDIR)$(salomepythondir)/$${modulen}__POA && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}__POA" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen}__POA ; \
done ; \
for filen in $(IDL_FILES_PY) ; do \
echo "Removing $(DESTDIR)$(salomepythondir)/$${filen}" && rm -f $(DESTDIR)$(salomepythondir)/$${filen}* ; \
done