ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement 'make dist' and 'make distcheck' steps support

Browse Source
This commit is contained in:
vsr 2008-09-16 10:56:24 +00:00
parent 8c0d5f2b5c
commit b66afe6860
14 changed files with 137 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile.am
View File

@ -26,15 +26,32 @@
include $(top_srcdir)/adm_local/unix/make_common_starter.am
if NETGENPLUGIN_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 !NETGENPLUGIN_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=NETGENPLUGIN_version.h
salomeinclude_DATA = NETGENPLUGIN_version.h
EXTRA_DIST+= \
EXTRA_DIST += \
build_configure \
clean_configure \
LICENCE
clean_configure
dist-hook:
rm -rf `find $(distdir) -name CVS`

3
adm_local/Makefile.am
View File

@ -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

5
adm_local/unix/config_files/Makefile.am
View File

@ -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_NETGEN.m4 \
dist_admlocalm4_DATA = \
check_NETGEN.m4 \
check_NETGENPLUGIN.m4

41
adm_local/unix/make_common_starter.am
View File

@ -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

13
bin/Makefile.am
View File

@ -24,13 +24,8 @@
include $(top_srcdir)/adm_local/unix/make_common_starter.am
#
# ===============================================================
# Files to be installed
# ===============================================================
#
# non-distributed files
nodist_salomescript_DATA = VERSION
# These files are data, module or lib files
nodist_salomescript_DATA= VERSION
EXTRA_DIST+= VERSION.in
# distributed files
dist_salomescript_SCRIPTS =

15
clean_configure Executable file
View File

@ -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

2
configure.ac
View File

@ -17,7 +17,7 @@
# Created from configure.in.base
#
AC_INIT([Salome2 Project NETGENPLUGIN module], [5.0.0], [webmaster.salome@opencascade.com], [salome])
AC_INIT([Salome2 Project NETGENPLUGIN module], [5.0.0], [webmaster.salome@opencascade.com], [SalomeNETGENPLUGIN])
AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET

17
idl/Makefile.am
View File

@ -28,21 +28,19 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
BASEIDL_FILES= NETGENPlugin_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 = libSalomeIDLNETGENPLUGIN.la
# Sources built from idl files
nodist_libSalomeIDLNETGENPLUGIN_la_SOURCES= NETGENPlugin_AlgorithmSK.cc
nodist_libSalomeIDLNETGENPLUGIN_la_SOURCES = NETGENPlugin_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)
libSalomeIDLNETGENPLUGIN_la_CPPFLAGS =\
libSalomeIDLNETGENPLUGIN_la_CPPFLAGS = \
$(KERNEL_CXXFLAGS) \
$(GEOM_CXXFLAGS) \
$(SMESH_CXXFLAGS) \
@ -51,7 +49,6 @@ libSalomeIDLNETGENPLUGIN_la_CPPFLAGS =\
-I$(top_builddir)/salome_adm/unix \
-I$(top_builddir)/idl
libSalomeIDLNETGENPLUGIN_la_LDFLAGS = -no-undefined -version-info=0:0:0
libSalomeIDLNETGENPLUGIN_la_LIBADD = \
$(KERNEL_LDFLAGS) -lSalomeIDLKernel \
@ -90,14 +87,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

26
resources/Makefile.am
View File

@ -27,13 +27,19 @@
include $(top_srcdir)/adm_local/unix/make_common_starter.am
dist_salomeres_DATA = \
mesh_algo_netgen_2d.png \
mesh_algo_netgen_2d3d.png \
mesh_hypo_netgen.png \
mesh_hypo_netgen_2d.png \
mesh_tree_algo_netgen_2d.png \
mesh_tree_algo_netgen_2d3d.png \
mesh_tree_hypo_netgen.png \
mesh_tree_hypo_netgen_2d.png \
NETGENPlugin.xml
dist_salomeres_DATA = \
NETGENPlugin.xml \
SalomeApp.xml
if NETGENPLUGIN_ENABLE_GUI
dist_salomeres_DATA += \
mesh_algo_netgen_2d.png \
mesh_algo_netgen_2d3d.png \
mesh_hypo_netgen.png \
mesh_hypo_netgen_2d.png \
mesh_tree_algo_netgen_2d.png \
mesh_tree_algo_netgen_2d3d.png \
mesh_tree_hypo_netgen.png \
mesh_tree_hypo_netgen_2d.png \
mesh_tree_algo_netgen.png
endif

9
resources/SalomeApp.xml Normal file
View File

@ -0,0 +1,9 @@
<document>
<section name="resources">
<parameter name="NETGENPlugin" value="${NETGENPLUGIN_ROOT_DIR}/share/salome/resources/netgenplugin"/>
</section>
<section name="SMESH">
<!-- Default SMESH module plugins -->
<parameter name="plugins" value="NETGENPlugin,GHS3DPlugin"/>
</section>
</document>

2
src/GUI/Makefile.am
View File

@ -33,7 +33,9 @@ lib_LTLIBRARIES = libNETGENPluginGUI.la
dist_libNETGENPluginGUI_la_SOURCES = \
NETGENPluginGUI.cxx \
NETGENPluginGUI_HypothesisCreator.h \
NETGENPluginGUI_HypothesisCreator.cxx \
NETGENPluginGUI_SimpleCreator.h \
NETGENPluginGUI_SimpleCreator.cxx
MOC_FILES = \

4
src/Makefile.am
View File

@ -27,10 +27,10 @@
include $(top_srcdir)/adm_local/unix/make_common_starter.am
#SUBDIRS = NETGEN NETGENPlugin GUI
SUBDIRS = NETGEN NETGENPlugin
if NETGENPLUGIN_ENABLE_GUI
SUBDIRS += GUI
endif
DIST_SUBDIRS = NETGEN NETGENPlugin GUI

8
src/NETGEN/Makefile.am
View File

@ -69,9 +69,13 @@ $(LIB_OBJ_O):
nodist_libNETGEN_la_SOURCES =
libNETGEN_la_LDFLAGS = $(LIB_OBJ_O) \
$(CAS_LDPATH) -lTKernel -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKMesh -lTKSTL $(FCLIBS) $(STDLIB)
libNETGEN_la_DEPENDENCIES = $(LIB_OBJ_O)
EXTRA_DIST += \
ReadMeForNgUsers \
netgen43ForSalome.patch \
netgen45ForSalome.patch \
netgen45lib64.patch

22
src/NETGENPlugin/Makefile.am
View File

@ -28,8 +28,26 @@
include $(top_srcdir)/adm_local/unix/make_common_starter.am
# header files
salomeinclude_HEADERS =
# header files
salomeinclude_HEADERS = \
NETGENPlugin_NETGEN_3D.hxx \
NETGENPlugin_NETGEN_3D_i.hxx \
NETGENPlugin_NETGEN_2D.hxx \
NETGENPlugin_NETGEN_2D_i.hxx \
NETGENPlugin_NETGEN_2D3D.hxx \
NETGENPlugin_NETGEN_2D3D_i.hxx \
NETGENPlugin_NETGEN_2D_ONLY.hxx \
NETGENPlugin_NETGEN_2D_ONLY_i.hxx \
NETGENPlugin_Hypothesis.hxx \
NETGENPlugin_Hypothesis_i.hxx \
NETGENPlugin_Hypothesis_2D.hxx \
NETGENPlugin_Hypothesis_2D_i.hxx \
NETGENPlugin_SimpleHypothesis_2D.hxx \
NETGENPlugin_SimpleHypothesis_3D.hxx \
NETGENPlugin_SimpleHypothesis_2D_i.hxx \
NETGENPlugin_SimpleHypothesis_3D_i.hxx \
NETGENPlugin_Mesher.hxx \
NETGENPlugin_Defs.hxx
# Libraries targets
lib_LTLIBRARIES = libNETGENEngine.la