From a894ec5002aa8088fa50f5ccef5200553d089a83 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 16 Sep 2008 08:58:54 +0000 Subject: [PATCH] Implement 'make dist' and 'make distcheck' steps support --- Makefile.am | 18 +++++++++++++ adm_local/unix/make_common_starter.am | 38 +++++++++++++++++---------- bin/Makefile.am | 4 ++- configure.ac | 2 +- idl/Makefile.am | 17 +++++------- src/Makefile.am | 2 ++ 6 files changed, 55 insertions(+), 26 deletions(-) diff --git a/Makefile.am b/Makefile.am index 23c9462..5a82da2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,6 +25,21 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am +if GHS3DPRLPLUGIN_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 !GHS3DPRLPLUGIN_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 @@ -36,3 +51,6 @@ salomeinclude_DATA = GHS3DPRLPLUGIN_version.h EXTRA_DIST += \ build_configure \ clean_configure + +dist-hook: + rm -rf `find $(distdir) -name CVS` diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index d31a1d0..1ea9fb9 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -31,48 +31,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 $@ -# uic-files generation +# resource files generation (qrcc) +qrc_%.cxx: %.qrc + $(QRCC) $< -o $@ -name $(*F) + +# qt forms files generation (uic) ui_%.h: %.ui $(UIC) -o $@ $< -EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts) +# 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 a1035bc..7839332 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -25,6 +25,8 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am +# non-distributed files nodist_salomescript_DATA = VERSION -EXTRA_DIST += VERSION.in +# distributed files +dist_salomescript_SCRIPTS = diff --git a/configure.ac b/configure.ac index 325cdd2..0b95008 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ # # --- -AC_INIT([Salome2 Project GHS3DPRLPLUGIN module], [5.0.0], [webmaster.salome@opencascade.com], [salome]) +AC_INIT([Salome2 Project GHS3DPRLPLUGIN module], [5.0.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPRLPLUGIN]) 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 96912a5..3f15614 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -34,21 +34,19 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am BASEIDL_FILES = GHS3DPRLPlugin_Algorithm.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 = libSalomeIDLGHS3DPRLPLUGIN.la # Sources built from idl files -nodist_libSalomeIDLGHS3DPRLPLUGIN_la_SOURCES= GHS3DPRLPlugin_AlgorithmSK.cc +nodist_libSalomeIDLGHS3DPRLPLUGIN_la_SOURCES = GHS3DPRLPlugin_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) -libSalomeIDLGHS3DPRLPLUGIN_la_CPPFLAGS =\ +libSalomeIDLGHS3DPRLPLUGIN_la_CPPFLAGS = \ $(KERNEL_CXXFLAGS) \ $(GEOM_CXXFLAGS) \ $(SMESH_CXXFLAGS) \ @@ -57,7 +55,6 @@ libSalomeIDLGHS3DPRLPLUGIN_la_CPPFLAGS =\ -I$(top_builddir)/salome_adm/unix \ -I$(top_builddir)/idl - libSalomeIDLGHS3DPRLPLUGIN_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSalomeIDLGHS3DPRLPLUGIN_la_LIBADD = \ $(KERNEL_LDFLAGS) -lSalomeIDLKernel \ @@ -96,14 +93,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 diff --git a/src/Makefile.am b/src/Makefile.am index 5e68c75..57db467 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,3 +30,5 @@ SUBDIRS = GHS3DPRLPlugin if GHS3DPRLPLUGIN_ENABLE_GUI SUBDIRS += gui tepal2med endif + +DIST_SUBDIRS = GHS3DPRLPlugin gui tepal2med -- 2.39.2