- Merged branch to avoid recursive make

git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@349 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
tchernobog 2006-02-19 14:34:41 +00:00
parent 89ee208887
commit 8bb6220819
11 changed files with 278 additions and 374 deletions

View File

@ -1,3 +1,32 @@
2006-02-17 23:41 tchernobog
* trunk/po/POTFILES.in, trunk/po/sgpemv2.pot: - Update localizable
string catalog
2006-02-17 23:33 tchernobog
* trunk/doc/Makefile.am, trunk/src/Makefile.am,
trunk/src/io_manager.hh, trunk/src/main.cc: - Fix compilation
2006-02-17 22:19 fpaparel
* trunk/src/Makefile.am, trunk/src/backend/Makefile.am,
trunk/src/backend/policy.hh, trunk/src/backend/string_utils.cc,
trunk/src/backend/string_utils.hh,
trunk/src/graphical_simulation.hh,
trunk/src/graphical_terminal_io.cc,
trunk/src/graphical_terminal_io.hh, trunk/src/io_manager.hh,
trunk/src/main.cc, trunk/src/standard_io.cc,
trunk/src/standard_io.hh, trunk/src/start_gui.cc,
trunk/src/start_gui.hh, trunk/src/text_simulation.cc,
trunk/src/text_simulation.hh: - added console interpreter - added
string_utils
2006-02-17 16:31 tchernobog
* trunk/ChangeLog, trunk/configure.ac, trunk/m4/ac_python_devel.m4:
- Check for Python distutils module presence
2006-02-17 16:08 tchernobog 2006-02-17 16:08 tchernobog
* trunk/src/Makefile.am, trunk/src/backend/Makefile.am, * trunk/src/Makefile.am, trunk/src/backend/Makefile.am,

View File

@ -1,4 +1,4 @@
# Makefile.am - Copyright 2005, University # Makefile.am - Copyright 2005, 2006, University
# of Padova, dept. of Pure and Applied # of Padova, dept. of Pure and Applied
# Mathematics # Mathematics
# #
@ -18,13 +18,258 @@
# along with SGPEMv2; if not, write to the Free Software # along with SGPEMv2; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# extra calls
.PHONY : apidox .PHONY : apidox
SUBDIRS = doc m4 po src # this should be the only recursive call
SUBDIRS = po
# directories definition
sharedir = $(pkgdatadir)
pycdir = $(sharedir)/policies
moddir = $(sharedir)/modules
localedir = @datadir@/locale
# ############################################################
#
# additional rules
#
# ############################################################
# swig implementation and proxy files generation for Python:
%_wrap.cc %.py : %.i
$(SWIG) $(SWIG_PYTHON_OPT) -o $@ $<
# ############################################################
#
# extra dist, cleanup and automake/aclocal flags
#
# ############################################################
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = config/config.rpath config/mkinstalldirs configure.ac gettext.h macros = m4/compilerflags.m4 \
m4/linkingflags.m4 \
m4/ac_python_devel.m4 \
m4/ac_pkg_swig.m4 \
m4/ac_python_module.m4
EXTRA_DIST = \
config/config.rpath \
config/mkinstalldirs \
configure.ac \
gettext.h \
$(macros)
MAINTAINERCLEANFILES = doc/API
# ############################################################
#
# desktop files and other distribution data
#
# ############################################################
# to be written when something will go here...
# ############################################################
#
# documentation
#
# ############################################################
info_TEXINFOS = \
doc/sgpem2uman.texi \
doc/sgpem2dman.texi
licenses = doc/fdl.texi doc/gpl.texi
EXTRA_DIST += $(licenses)
sgpem2uman_TEXINFOS = $(licenses) doc/vers-uman.texi
sgpem2dman_TEXINFOS = $(licenses) doc/vers-dman.texi
apidox : apidox :
$(MAKE) -C $(top_builddir)/doc apidox if HAVE_DOXYGEN
doxygen config/Doxyfile
else
@echo "** Doxygen not installed. Skipping generating API docs."
test ! -d 'doc/API' && mkdir 'doc/API'
endif
dist-hook : apidox
cp -Rp 'doc/API' '$(distdir)/doc/API'
distclean-local :
if test -d 'doc/API'; then rm -rf 'doc/API'; fi
# ############################################################
#
# source : main executable
#
# ############################################################
# Program & library names
bin_PROGRAMS = sgpemv2
sgpemv2_INCLUDES = -I@top_srcdir@
sgpemv2_CPPFLAGS = \
-DPYCDIR="\"$(pycdir)\"" \
-DMODDIR="\"$(moddir)\"" \
-DLOCALEDIR="\"$(localedir)\"" \
$(CAIRO_CFLAGS) \
$(GTKMM_CFLAGS) \
$(PYTHON_CPPFLAGS) \
$(GTHREAD_CFLAGS)
sgpemv2_LDFLAGS = \
-L@builddir@/src/backend \
$(LT_LDFLAGS)
sgpemv2_LDADD = \
src/backend/libbackend.la \
$(CAIRO_LIBS) \
$(GTKMM_LIBS) \
$(GTHREAD_LIBS)
# Please keep this in sorted order:
sgpemv2_SOURCES = \
src/graphical_terminal_io.cc \
src/main.cc \
src/main_window.cc \
src/observer.cc \
src/parse_opts.cc \
src/simulation.cc \
src/standard_io.cc \
src/start_gui.cc \
src/text_simulation.cc
noinst_HEADERS = \
src/graphical_simulation.hh \
src/graphical_terminal_io.hh \
src/io_manager.hh \
src/main.hh \
src/main_window.hh \
src/observer.hh \
src/parse_opts.hh \
src/simulation.hh \
src/standard_io.hh \
src/start_gui.hh \
src/text_simulation.hh
# ############################################################
#
# source : libbackend.la
#
# ############################################################
# Program & library names
pkglib_LTLIBRARIES = src/backend/libbackend.la
src_backend_libbackend_la_INCLUDES = -I@top_srcdir@
src_backend_libbackend_la_CPPFLAGS = \
-DPYCDIR="\"$(pycdir)\"" \
-DMODDIR="\"$(moddir)\"" \
-DLOCALEDIR="\"$(localedir)\"" \
$(PYTHON_CPPFLAGS) \
$(GLIBMM_CFLAGS)
src_backend_libbackend_la_LIBADD = \
src/backend/pyloader/libpyloader.la
src_backend_libbackend_la_LDFLAGS = $(GLIBMM_LDFLAGS) \
$(LT_LDFLAGS) \
-L@builddir@/src/backend/pyloader
# Please keep this in sorted order:
src_backend_libbackend_la_SOURCES = \
src/backend/history.cc \
src/backend/observed_subject.cc \
src/backend/policy.cc \
src/backend/policy_manager.cc \
src/backend/policy_parameters.cc \
src/backend/process.cc \
src/backend/schedulable.cc \
src/backend/schedulable_list.cc \
src/backend/schedulable_status.cc \
src/backend/scheduler.cc \
src/backend/slice.cc \
src/backend/string_utils.cc
noinst_HEADERS += \
src/backend/history.hh \
src/backend/observed_subject.hh \
src/backend/policy.hh \
src/backend/policy_manager.hh \
src/backend/policy_parameters.hh \
src/backend/process.hh \
src/backend/schedulable.hh \
src/backend/schedulable_list.hh \
src/backend/schedulable_status.hh \
src/backend/scheduler.hh \
src/backend/slice.hh \
src/backend/string_utils.hh
# ############################################################
#
# source : libpyloader.la
#
# ############################################################
pkglib_LTLIBRARIES += src/backend/pyloader/libpyloader.la
src_backend_pyloader_libpyloader_la_INCLUDES = -I@top_srcdir@
src_backend_pyloader_libpyloader_la_CPPFLAGS = \
-DPYCDIR="\"$(pycdir)\"" \
-DMODDIR="\"$(moddir)\"" \
-DLOCALEDIR="\"$(localedir)\"" \
$(PYTHON_CPPFLAGS) \
$(GLIBMM_CFLAGS)
src_backend_pyloader_libpyloader_la_LIBADD = \
$(PYTHON_LDFLAGS) \
$(PYTHON_EXTRA_LIBS) \
$(GLIBMM_LIBS)
src_backend_pyloader_libpyloader_la_LDFLAGS = \
$(PYTHON_EXTRA_LDFLAGS) \
$(LT_LDFLAGS)
# Please keep this in sorted order:
src_backend_pyloader_libpyloader_la_SOURCES = \
src/backend/pyloader/python_policy.cc \
src/backend/pyloader/python_policy_manager.cc
noinst_HEADERS += \
src/backend/pyloader/python_policy.hh \
src/backend/pyloader/python_policy_manager.hh
mod_PYTHON = \
src/backend/pyloader/Abstract.py \
src/backend/pyloader/Policy.py
# ############################################################
#
# source : templates
#
# ############################################################
EXTRA_DIST += \
src/templates/parameter.tcc \
src/templates/smartp.tcc
noinst_HEADERS += \
src/templates/smartp.hh
# ############################################################
#
# source : builtin-policies
#
# ############################################################
# built-in policies
pyc_PYTHON = # fcfs.py rr.py rr-p.py ...
# ############################################################
#
# check : testsuite
#
# ############################################################
# DEJATOOL = src/testsuite/example-test.exp

View File

@ -142,14 +142,6 @@ AC_CONFIG_HEADERS([config.h:config.h.in])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
doc/Makefile
m4/Makefile
po/Makefile.in po/Makefile.in
src/Makefile
src/backend/Makefile
src/backend/pyloader/Makefile
src/builtin-policies/Makefile
src/templates/Makefile
src/testsuite/Makefile
]) ])
AC_OUTPUT AC_OUTPUT

View File

@ -1,45 +0,0 @@
# doc/Makefile.am - Copyright 2005, University
# of Padova, dept. of Pure and Applied
# Mathematics
#
# This file is part of SGPEMv2.
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# SGPEMv2 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with SGPEMv2; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
.PHONY : apidox
info_TEXINFOS = sgpem2uman.texi sgpem2dman.texi
licenses = fdl.texi gpl.texi
sgpem2uman_TEXINFOS = $(licenses) vers-uman.texi
sgpem2dman_TEXINFOS = $(licenses) vers-dman.texi
apidox :
if HAVE_DOXYGEN
doxygen @top_builddir@/config/Doxyfile
else
@echo "** Doxygen not installed. Skipping generating API docs."
test ! -d './API' && mkdir './API'
endif
dist-hook : apidox
cp -Rp './API' '$(distdir)/API'
distclean-local :
if test -d './API'; then rm -rf './API'; fi
MAINTAINERCLEANFILES = API

View File

@ -1,32 +0,0 @@
# m4/Makefile.am - Copyright 2005, University
# of Padova, dept. of Pure and Applied
# Mathematics
#
# This file is part of SGPEMv2.
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# SGPEMv2 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with SGPEMv2; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# aclocaldir = $(datadir)/aclocal
# better if we don't install our macros...
# -> aclocal_DATA = ...
macros = compilerflags.m4 \
linkingflags.m4 \
ac_python_devel.m4 \
ac_pkg_swig.m4 \
ac_python_module.m4
EXTRA_DIST = $(macros)

View File

@ -1,73 +0,0 @@
# src/Makefile.am - Copyright 2005, 2006, University
# of Padova, dept. of Pure and Applied
# Mathematics
#
# This file is part of SGPEMv2.
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# SGPEMv2 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with SGPEMv2; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SUBDIRS = backend builtin-policies testsuite
#additional rules:
%_wrap.cc : %.i
$(SWIG) $(SWIG_PYTHON_OPT) -o $@ $<
# Program & library names
bin_PROGRAMS = sgpemv2
# Other directories
sharedir = $(pkgdatadir)
pycdir = $(sharedir)/policies
moddir = $(sharedir)/modules
localedir = @datadir@/locale
sgpemv2_CPPFLAGS = -I@top_srcdir@ \
-DPYCDIR="\"$(pycdir)\"" \
-DMODDIR="\"$(moddir)\"" \
-DLOCALEDIR="\"$(localedir)\"" \
$(CAIRO_CFLAGS) \
$(GTKMM_CFLAGS) \
$(PYTHON_CPPFLAGS) \
$(GTHREAD_CFLAGS)
sgpemv2_LDFLAGS = -L@builddir@/backend \
$(LT_LDFLAGS)
sgpemv2_LDADD = -lbackend \
$(CAIRO_LIBS) \
$(GTKMM_LIBS) \
$(GTHREAD_LIBS)
# Please keep this in sorted order:
sgpemv2_SOURCES = \
graphical_terminal_io.cc \
main.cc \
main_window.cc \
observer.cc \
parse_opts.cc \
simulation.cc \
standard_io.cc \
start_gui.cc \
text_simulation.cc
noinst_HEADERS = \
graphical_terminal_io.hh \
io_manager.hh \
main.hh \
main_window.hh \
observer.hh \
parse_opts.hh \
simulation.hh \
standard_io.hh \
start_gui.hh \
text_simulation.hh

View File

@ -1,75 +0,0 @@
# src/backend/Makefile.am - Copyright 2005, 2006, University
# of Padova, dept. of Pure and Applied
# Mathematics
#
# This file is part of SGPEMv2.
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# SGPEMv2 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with SGPEMv2; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# you'll want to setup a testsuite for this component, sooner or later.
#SUBDIRS = testsuite
SUBDIRS = pyloader
#additional rules:
%_wrap.cc : %.i
$(SWIG) $(SWIG_PYTHON_OPT) -o $@ $<
# Program & library names
pkglib_LTLIBRARIES = libbackend.la
# Other directories
sharedir = $(pkgdatadir)
pycdir = $(sharedir)/policies
moddir = $(sharedir)/modules
localedir = @datadir@/locale
libbackend_la_CPPFLAGS = -I@top_srcdir@ \
-DPYCDIR="\"$(pycdir)\"" \
-DMODDIR="\"$(moddir)\"" \
-DLOCALEDIR="\"$(localedir)\"" \
$(PYTHON_CPPFLAGS) \
$(GLIBMM_CFLAGS)
libbackend_la_LIBADD = -lpyloader
libbackend_la_LDFLAGS = $(GLIBMM_LDFLAGS) \
$(LT_LDFLAGS) -L@builddir@/pyloader/
# Please keep this in sorted order:
libbackend_la_SOURCES = \
history.cc \
observed_subject.cc \
policy.cc \
policy_manager.cc \
policy_parameters.cc \
process.cc \
schedulable.cc \
schedulable_list.cc \
schedulable_status.cc \
scheduler.cc \
slice.cc \
string_utils.cc
noinst_HEADERS = \
history.hh \
observed_subject.hh \
policy.hh \
policy_manager.hh \
policy_parameters.hh \
process.hh \
schedulable.hh \
schedulable_list.hh \
schedulable_status.hh \
scheduler.hh \
slice.hh \
string_utils.hh

View File

@ -1,58 +0,0 @@
# src/pyloader/Makefile.am - Copyright 2005, 2006, University
# of Padova, dept. of Pure and Applied
# Mathematics
#
# This file is part of SGPEMv2.
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# SGPEMv2 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with SGPEMv2; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# you'll want to setup a testsuite for this component, sooner or later.
#SUBDIRS = testsuite
#additional rules:
%_wrap.cc : %.i
$(SWIG) $(SWIG_PYTHON_OPT) -o $@ $<
# Program & library names
pkglib_LTLIBRARIES = libpyloader.la
# Other directories
sharedir = $(pkgdatadir)
pycdir = $(sharedir)/policies
moddir = $(sharedir)/modules
localedir = @datadir@/locale
libpyloader_la_CPPFLAGS = -I@top_srcdir@ \
-DPYCDIR="\"$(pycdir)\"" \
-DMODDIR="\"$(moddir)\"" \
-DLOCALEDIR="\"$(localedir)\"" \
$(PYTHON_CPPFLAGS) \
$(GLIBMM_CFLAGS)
libpyloader_la_LIBADD = $(PYTHON_LDFLAGS) \
$(PYTHON_EXTRA_LIBS) \
$(GLIBMM_LIBS)
libpyloader_la_LDFLAGS = $(PYTHON_EXTRA_LDFLAGS) \
$(LT_LDFLAGS)
# Please keep this in sorted order:
libpyloader_la_SOURCES = \
python_policy.cc \
python_policy_manager.cc
noinst_HEADERS = python_policy.hh \
python_policy_manager.hh
mod_PYTHON = Abstract.py \
Policy.py

View File

@ -1,30 +0,0 @@
# src/builtin-policies/Makefile.am - Copyright 2005, 2006, University
# of Padova, dept. of Pure and Applied
# Mathematics
#
# This file is part of SGPEMv2.
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# SGPEMv2 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with SGPEMv2; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Other directories
sharedir = $(pkgdatadir)
pycdir = $(sharedir)/policies
moddir = $(sharedir)/modules
# loadable python modules
mod_PYTHON = # policy.py
# built-in policies
pyc_PYTHON = # fcfs.py rr.py rr-p.py ...

View File

@ -1,26 +0,0 @@
# src/templates/Makefile.am - Copyright 2005, 2006, University
# of Padova, dept. of Pure and Applied
# Mathematics
#
# This file is part of SGPEMv2.
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# SGPEMv2 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with SGPEMv2; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
EXTRA_DIST = \
smartp.tcc
noinst_HEADERS = \
smartp.hh

View File

@ -1,23 +0,0 @@
# src/testsuite/Makefile.am - Copyright 2005, 2006, University
# of Padova, dept. of Pure and Applied
# Mathematics
#
# This file is part of SGPEMv2.
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# SGPEMv2 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with SGPEMv2; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Tests to distribute:
# EXTRA_DIST = example-test.exp