mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-02-15 21:13:07 +05:00
Fix make distcheck errors in without GUI mode
This commit is contained in:
parent
bdd6176cbd
commit
b8043c6073
20
configure.ac
20
configure.ac
@ -301,10 +301,22 @@ if test "${gui_ok}" = "yes"; then
|
||||
echo
|
||||
|
||||
CHECK_QT
|
||||
AC_PATH_PROG(PYUIC, pyuic4)
|
||||
AC_SUBST(PYUIC)
|
||||
AC_PATH_PROG(PYRCC, pyrcc4)
|
||||
AC_SUBST(PYRCC)
|
||||
|
||||
echo
|
||||
echo ---------------------------------------------
|
||||
echo testing sip
|
||||
echo ---------------------------------------------
|
||||
echo
|
||||
|
||||
CHECK_SIP
|
||||
|
||||
echo
|
||||
echo ---------------------------------------------
|
||||
echo testing pyqt
|
||||
echo ---------------------------------------------
|
||||
echo
|
||||
|
||||
CHECK_PYQT
|
||||
|
||||
echo
|
||||
echo ---------------------------------------------
|
||||
|
@ -45,11 +45,15 @@ MeshCut_LDFLAGS = $(MED2_LIBS) $(HDF5_LIBS)
|
||||
|
||||
|
||||
UIPY_FILES = MeshCutDialog.py
|
||||
BUILT_SOURCES = $(UIPY_FILES)
|
||||
bin_SCRIPTS = $(UIPY_FILES) meshcut_plugin.py
|
||||
clean-local:
|
||||
rm -f $(UIPY_FILES)
|
||||
EXTRA_DIST += MeshCutDialog.ui meshcut_plugin.py
|
||||
|
||||
if SMESH_ENABLE_GUI
|
||||
dist_salomescript_SCRIPTS = meshcut_plugin.py
|
||||
nodist_salomescript_SCRIPTS = $(UIPY_FILES)
|
||||
endif
|
||||
|
||||
CLEANFILES = $(UIPY_FILES)
|
||||
|
||||
EXTRA_DIST += $(UIPY_FILES:%.py=%.ui)
|
||||
|
||||
%.py : %.ui
|
||||
pyuic4 $< -o $@
|
||||
$(PYUIC) $< -o $@
|
||||
|
@ -1,6 +1,12 @@
|
||||
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
|
||||
spadderpy_PYTHON = \
|
||||
|
@ -32,11 +32,9 @@ dist_spadderpy_DATA= \
|
||||
concrete.png \
|
||||
steelbar.png
|
||||
|
||||
PYUIC = @PYUIC@
|
||||
%_ui.py:%.ui
|
||||
$(PYUIC) -x $< -o $@
|
||||
|
||||
PYRCC = @PYRCC@
|
||||
%_rc.py:%.qrc
|
||||
$(PYRCC) $< -o $@
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user