ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-15 21:03:07 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix make distcheck errors in without GUI mode

Browse Source
This commit is contained in:
vsr 2011-11-23 15:55:56 +00:00
parent bdd6176cbd
commit b8043c6073
4 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -301,10 +301,22 @@ if test "${gui_ok}" = "yes"; then
echo echo
CHECK_QT CHECK_QT
AC_PATH_PROG(PYUIC, pyuic4)
AC_SUBST(PYUIC) echo
AC_PATH_PROG(PYRCC, pyrcc4) echo ---------------------------------------------
AC_SUBST(PYRCC) echo testing sip
echo ---------------------------------------------
echo
CHECK_SIP
echo
echo ---------------------------------------------
echo testing pyqt
echo ---------------------------------------------
echo
CHECK_PYQT
echo echo
echo --------------------------------------------- echo ---------------------------------------------

16
src/Tools/MeshCut/Makefile.am
View File

@ -45,11 +45,15 @@ MeshCut_LDFLAGS = $(MED2_LIBS) $(HDF5_LIBS)
UIPY_FILES = MeshCutDialog.py UIPY_FILES = MeshCutDialog.py
BUILT_SOURCES = $(UIPY_FILES)
bin_SCRIPTS = $(UIPY_FILES) meshcut_plugin.py if SMESH_ENABLE_GUI
clean-local: dist_salomescript_SCRIPTS = meshcut_plugin.py
rm -f $(UIPY_FILES) nodist_salomescript_SCRIPTS = $(UIPY_FILES)
EXTRA_DIST += MeshCutDialog.ui meshcut_plugin.py endif
CLEANFILES = $(UIPY_FILES)
EXTRA_DIST += $(UIPY_FILES:%.py=%.ui)
%.py : %.ui %.py : %.ui
pyuic4 $< -o $@ $(PYUIC) $< -o $@

8
src/Tools/padder/spadderpy/Makefile.am
View File

@ -1,6 +1,12 @@
include $(top_srcdir)/adm_local/unix/make_common_starter.am include $(top_srcdir)/adm_local/unix/make_common_starter.am
SUBDIRS = gui plugin SUBDIRS =
if SMESH_ENABLE_GUI
SUBDIRS += gui plugin
endif
DIST_SUBDIRS = gui plugin
spadderpydir=$(smeshpypkgdir)/spadder spadderpydir=$(smeshpypkgdir)/spadder
spadderpy_PYTHON = \ spadderpy_PYTHON = \

2
src/Tools/padder/spadderpy/gui/Makefile.am
View File

@ -32,11 +32,9 @@ dist_spadderpy_DATA= \
concrete.png \ concrete.png \
steelbar.png steelbar.png
PYUIC = @PYUIC@
%_ui.py:%.ui %_ui.py:%.ui
$(PYUIC) -x $< -o $@ $(PYUIC) -x $< -o $@
PYRCC = @PYRCC@
%_rc.py:%.qrc %_rc.py:%.qrc
$(PYRCC) $< -o $@ $(PYRCC) $< -o $@