From f90f8921260c59f53fe21211444f0caa18b7cd97 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 27 Mar 2008 14:38:53 +0000 Subject: [PATCH] This commit was generated by cvs2git to create tag 'V4_1_0rc1'. Sprout from BR_Dev_For_4_0 2007-09-24 07:25:28 UTC jfa 'NPAL17027: Change in BLSURFPLUGIN and HexoticPLUGIN. Correction for compilation with Salome V4.' Cherrypick from master 2008-03-27 14:38:52 UTC jfa 'Join modifications from BR_Dev_For_4_0 tag V4_1_1.': BLSURFPLUGIN_version.h.in adm_local/unix/make_common_starter.am --- BLSURFPLUGIN_version.h.in | 34 +++++++++++++++++ adm_local/unix/make_common_starter.am | 54 +++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 BLSURFPLUGIN_version.h.in create mode 100644 adm_local/unix/make_common_starter.am diff --git a/BLSURFPLUGIN_version.h.in b/BLSURFPLUGIN_version.h.in new file mode 100644 index 0000000..ee5d1d4 --- /dev/null +++ b/BLSURFPLUGIN_version.h.in @@ -0,0 +1,34 @@ +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ +// +// File : BLSURFPLUGIN_version.h +// Author : Vadim SANDLER +// Module : SALOME + +#if !defined(__BLSURFPLUGIN_VERSION_H__) +#define __BLSURFPLUGIN_VERSION_H__ + +/* + BLSURFPLUGIN_VERSION is (major << 16) + (minor << 8) + patch. +*/ + +#define BLSURFPLUGIN_VERSION_STR "@VERSION@" +#define BLSURFPLUGIN_VERSION @XVERSION@ + +#endif // __BLSURFPLUGIN_VERSION_H__ diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am new file mode 100644 index 0000000..5339413 --- /dev/null +++ b/adm_local/unix/make_common_starter.am @@ -0,0 +1,54 @@ +# +# ============================================================ +# This file defines the common definitions used in several +# Makefile. This file must be included, if needed, by the file +# Makefile.am. +# ============================================================ +# + +# Standard directory for installation +salomeincludedir = $(includedir)/@PACKAGE@ +libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@ +bindir = $(prefix)/bin/@PACKAGE@ +salomescriptdir = $(bindir) + +# Directory for installing idl files +salomeidldir = $(prefix)/idl/@PACKAGE@ + +# Directory for installing resource files +salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@ + +# Directories for installing admin files +admlocaldir = $(prefix)/adm_local +admlocalunixdir = $(admlocaldir)/unix +admlocalm4dir = $(admlocaldir)/unix/config_files + +# Shared modules installation directory +sharedpkgpythondir =$(pkgpythondir)/shared_modules + +# Documentation directory +docdir = $(datadir)/doc/@PACKAGE@ + +# common rules + +# moc-files generation +%_moc.cxx: %.h + $(MOC) $< -o $@ + +# qm-files generation +%.qm: %.po + $(MSG2QM) $< $@ + +EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=%.po) + +mostlyclean-local: + rm -f @builddir@/*_moc.cxx + rm -f @builddir@/*.qm + +# tests +tests: unittest + +unittest: $(UNIT_TEST_PROG) + @if test "x$(UNIT_TEST_PROG)" != "x"; then \ + $(UNIT_TEST_PROG); \ + fi; -- 2.39.2