From e3256962769cb09ae0506421af5e69360c63e73e Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 16 Sep 2008 08:23:46 +0000 Subject: [PATCH] Implement 'make dist' and 'make distcheck' steps support --- Makefile.am | 25 +++++++++++---- adm_local/Makefile.am | 3 ++ adm_local/unix/config_files/Makefile.am | 7 +++-- adm_local/unix/make_common_starter.am | 41 +++++++++++++++++-------- bin/Makefile.am | 13 +++----- clean_configure | 15 +++++++++ configure.ac | 2 +- idl/Makefile.am | 38 ++++++++++------------- resources/Makefile.am | 11 +++++-- resources/SalomeApp.xml | 9 ++++++ src/Makefile.am | 11 +++++-- 11 files changed, 117 insertions(+), 58 deletions(-) create mode 100755 clean_configure create mode 100644 resources/SalomeApp.xml diff --git a/Makefile.am b/Makefile.am index 6804fb9..ff7d848 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,19 +26,32 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = idl adm_local resources src bin +if GHS3DPLUGIN_ENABLE_GUI + ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ + -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ + -I ${MED_ROOT_DIR}/adm_local/unix/config_files \ + -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \ + -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files +else !GHS3DPLUGIN_ENABLE_GUI + ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ + -I ${MED_ROOT_DIR}/adm_local/unix/config_files \ + -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \ + -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files +endif + +SUBDIRS = idl adm_local resources src bin DIST_SUBDIRS = idl adm_local resources src bin DISTCLEANFILES = a.out aclocal.m4 configure -salomeinclude_DATA=GHS3DPLUGIN_version.h +salomeinclude_DATA = GHS3DPLUGIN_version.h -EXTRA_DIST+= \ +EXTRA_DIST += \ build_configure \ - clean_configure \ - LICENCE + clean_configure dist-hook: rm -rf `find $(distdir) -name CVS` diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 7ae83a6..b2d96e9 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -16,4 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + SUBDIRS = unix diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index c6a6652..232d47e 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -16,8 +16,9 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am -dist_admlocalm4_DATA=\ -check_GHS3D.m4\ -check_GHS3DPLUGIN.m4 +dist_admlocalm4_DATA = \ + check_GHS3D.m4 \ + check_GHS3DPLUGIN.m4 diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index c6e076e..c8f9734 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -7,43 +7,58 @@ # # Standard directory for installation -salomeincludedir = $(includedir)/@PACKAGE@ -libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@ -bindir = $(prefix)/bin/@PACKAGE@ +salomeincludedir = $(includedir)/salome +libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome +bindir = $(prefix)/bin/salome salomescriptdir = $(bindir) +salomepythondir = $(pythondir)/salome +salomepyexecdir = $(pyexecdir)/salome # Directory for installing idl files -salomeidldir = $(prefix)/idl/@PACKAGE@ +salomeidldir = $(prefix)/idl/salome # Directory for installing resource files -salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@ +salomeresdir = $(prefix)/share/salome/resources/@MODULE_NAME@ # Directories for installing admin files -admlocaldir = $(prefix)/adm_local -admlocalunixdir = $(admlocaldir)/unix -admlocalm4dir = $(admlocaldir)/unix/config_files +admlocaldir = $(prefix)/adm_local +admlocalunixdir = $(admlocaldir)/unix +admlocalm4dir = $(admlocaldir)/unix/config_files # Shared modules installation directory -sharedpkgpythondir =$(pkgpythondir)/shared_modules +sharedpkgpythondir = $(salomepythondir)/shared_modules # Documentation directory -docdir = $(datadir)/doc/@PACKAGE@ +docdir = $(datadir)/doc/salome # common rules -# moc-files generation +# meta object implementation files generation (moc) %_moc.cxx: %.h $(MOC) $< -o $@ -# qm-files generation +# translation (*.qm) files generation (lrelease) %.qm: %.ts $(LRELEASE) $< -qm $@ -EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=%.ts) +# resource files generation (qrcc) +qrc_%.cxx: %.qrc + $(QRCC) $< -o $@ -name $(*F) +# qt forms files generation (uic) +ui_%.h: %.ui + $(UIC) -o $@ $< + +# extra distributed files +EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \ + $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts) + +# customize clean operation mostlyclean-local: rm -f @builddir@/*_moc.cxx rm -f @builddir@/*.qm + rm -f @builddir@/ui_*.h + rm -f @builddir@/qrc_*.cxx # tests tests: unittest diff --git a/bin/Makefile.am b/bin/Makefile.am index a9fe51d..80722cd 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -23,13 +23,8 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -# -# =============================================================== -# Files to be installed -# =============================================================== -# - -# These files are data, module or lib files -nodist_salomescript_DATA= VERSION +# non-distributed files +nodist_salomescript_DATA = VERSION -EXTRA_DIST+= VERSION.in +# distributed files +dist_salomescript_SCRIPTS = diff --git a/clean_configure b/clean_configure new file mode 100755 index 0000000..be0b542 --- /dev/null +++ b/clean_configure @@ -0,0 +1,15 @@ +#!/bin/sh + +rm -rf autom4te.cache aclocal.m4 configure make_config +find . -name "*~" -print -exec rm {} \; +find . -name "*.pyc" -print -exec rm {} \; +#exit +# ==================== ON SORT AVANT + +find bin -name Makefile.in | xargs rm -f +find doc -name Makefile.in | xargs rm -f +find idl -name Makefile.in | xargs rm -f +find resources -name Makefile.in | xargs rm -f +find salome_adm -name Makefile.in | xargs rm -f +find src -name Makefile.in | xargs rm -f +rm -f Makefile.in diff --git a/configure.ac b/configure.ac index 677aede..a6dc466 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ # Created from configure.in.base # -AC_INIT([Salome2 Project GHS3DPLUGIN module],[5.0.0], [webmaster.salome@opencascade.com], [salome]) +AC_INIT([Salome2 Project GHS3DPLUGIN module],[5.0.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPLUGIN]) AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET diff --git a/idl/Makefile.am b/idl/Makefile.am index 0f0f709..a82977f 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -26,13 +26,10 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -BASEIDL_FILES = \ - GHS3DPlugin_Algorithm.idl - -EXTRA_DIST+= $(BASEIDL_FILES) +BASEIDL_FILES = GHS3DPlugin_Algorithm.idl # This variable defines the files to be installed -salomeidl_DATA = $(BASEIDL_FILES) +dist_salomeidl_DATA = $(BASEIDL_FILES) # GUI idl common library lib_LTLIBRARIES = libSalomeIDLGHS3DPLUGIN.la @@ -44,23 +41,23 @@ nodist_libSalomeIDLGHS3DPLUGIN_la_SOURCES = \ GHS3DPlugin_AlgorithmDynSK.cc: GHS3DPlugin_AlgorithmSK.cc # header files must be exported: other modules have to use this library -nodist_salomeinclude_HEADERS= $(BASEIDL_FILES:%.idl=%.hh) +nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh) -libSalomeIDLGHS3DPLUGIN_la_CPPFLAGS =\ +libSalomeIDLGHS3DPLUGIN_la_CPPFLAGS = \ -I$(top_builddir)/salome_adm/unix \ -I$(top_builddir)/idl \ $(CORBA_CXXFLAGS) \ $(CORBA_INCLUDES) \ $(KERNEL_CXXFLAGS) \ - $(SMESH_CXXFLAGS) \ - $(GEOM_CXXFLAGS) + $(GEOM_CXXFLAGS) \ + $(SMESH_CXXFLAGS) libSalomeIDLGHS3DPLUGIN_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSalomeIDLGHS3DPLUGIN_la_LIBADD = \ - @CORBA_LIBS@ \ $(KERNEL_LDFLAGS) -lSalomeIDLKernel \ + $(GEOM_LDFLAGS) -lSalomeIDLGEOM \ $(SMESH_LDFLAGS) -lSalomeIDLSMESH \ - $(GEOM_LDFLAGS) -lSalomeIDLGEOM + @CORBA_LIBS@ # These variables defines the building process of CORBA files OMNIORB_IDL = @OMNIORB_IDL@ @@ -69,23 +66,22 @@ OMNIORB_IDLPYFLAGS = \ @OMNIORB_IDLPYFLAGS@ \ -I$(top_builddir)/idl/salome \ -I$(KERNEL_ROOT_DIR)/idl/salome \ - -I$(SMESH_ROOT_DIR)/idl/salome \ - -I$(GEOM_ROOT_DIR)/idl/salome + -I$(GEOM_ROOT_DIR)/idl/salome \ + -I$(SMESH_ROOT_DIR)/idl/salome IDLCXXFLAGS = \ -bcxx \ @IDLCXXFLAGS@ \ -I$(top_builddir)/idl/salome \ -I$(KERNEL_ROOT_DIR)/idl/salome \ - -I$(SMESH_ROOT_DIR)/idl/salome \ -I$(GEOM_ROOT_DIR)/idl/salome \ + -I$(SMESH_ROOT_DIR)/idl/salome \ -I$(top_builddir)/salome_adm/unix - IDLPYFLAGS = \ @IDLPYFLAGS@ \ -I$(KERNEL_ROOT_DIR)/idl/salome \ - -I$(SMESH_ROOT_DIR)/idl/salome \ - -I$(GEOM_ROOT_DIR)/idl/salome + -I$(GEOM_ROOT_DIR)/idl/salome \ + -I$(SMESH_ROOT_DIR)/idl/salome # potential problem on parallel make on the following - multiple outputs SUFFIXES = .idl .hh SK.cc @@ -95,14 +91,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 @@ -116,7 +112,7 @@ mostlyclean-local: @for dep in $^ dummy; do \ if [ $$dep != "dummy" ]; then \ echo Building dependencies for $$dep; \ - $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome -I$(SMESH_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \ + $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome -I$(SMESH_ROOT_DIR)/idl/salome -I$(top_builddir)/salome_adm/unix $$dep 2>/dev/null | \ sed 's/\.o/\SK.cc/' >>$@; \ fi; \ done ; diff --git a/resources/Makefile.am b/resources/Makefile.am index f990b2c..f8bdf71 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -27,7 +27,12 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -dist_salomeres_DATA = \ - GHS3DPlugin.xml \ - mesh_hypo_ghs3d.png \ +dist_salomeres_DATA = \ + GHS3DPlugin.xml \ + SalomeApp.xml + +if GHS3DPLUGIN_ENABLE_GUI + dist_salomeres_DATA += \ + mesh_hypo_ghs3d.png \ mesh_tree_hypo_ghs3d.png +endif diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml new file mode 100644 index 0000000..80ae7ae --- /dev/null +++ b/resources/SalomeApp.xml @@ -0,0 +1,9 @@ + +
+ +
+
+ + +
+ diff --git a/src/Makefile.am b/src/Makefile.am index 043971b..c9e59d4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,8 +31,15 @@ if GHS3DPLUGIN_ENABLE_GUI SUBDIRS = GUI endif +DIST_SUBDIRS = GUI + # header files -salomeinclude_HEADERS = +salomeinclude_HEADERS = \ + GHS3DPlugin_Defs.hxx \ + GHS3DPlugin_GHS3D.hxx \ + GHS3DPlugin_GHS3D_i.hxx \ + GHS3DPlugin_Hypothesis.hxx \ + GHS3DPlugin_Hypothesis_i.hxx # Libraries targets lib_LTLIBRARIES = libGHS3DEngine.la @@ -46,13 +53,13 @@ dist_libGHS3DEngine_la_SOURCES = \ libGHS3DEngine_la_CPPFLAGS = \ $(KERNEL_CXXFLAGS) \ + $(CAS_CPPFLAGS) \ $(GEOM_CXXFLAGS) \ $(MED_CXXFLAGS) \ $(SMESH_CXXFLAGS) \ $(BOOST_CPPFLAGS) \ $(CORBA_CXXFLAGS) \ $(CORBA_INCLUDES) \ - $(CAS_CPPFLAGS) \ -I$(top_builddir)/idl \ -I$(top_builddir)/salome_adm/unix -- 2.39.2