- Initial split of libpyloader from libbackend. Will need rework
in order to: - fix wrong design - fix include paths - fix installation of header files git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@333 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
parent
6d5e9270a8
commit
5554ec2256
|
@ -43,7 +43,7 @@ sgpemv2_CPPFLAGS = -I@top_srcdir@ \
|
||||||
sgpemv2_LDFLAGS = -L@builddir@/backend \
|
sgpemv2_LDFLAGS = -L@builddir@/backend \
|
||||||
-L@builddir@/pyloader \
|
-L@builddir@/pyloader \
|
||||||
$(LT_LDFLAGS)
|
$(LT_LDFLAGS)
|
||||||
sgpemv2_LDADD = -lbackend -lpyloader \
|
sgpemv2_LDADD = -lbackend \
|
||||||
$(CAIRO_LIBS) \
|
$(CAIRO_LIBS) \
|
||||||
$(GTKMM_LIBS)
|
$(GTKMM_LIBS)
|
||||||
|
|
||||||
|
|
|
@ -40,10 +40,9 @@ libbackend_la_CPPFLAGS = -I@top_srcdir@ \
|
||||||
-DLOCALEDIR="\"$(localedir)\"" \
|
-DLOCALEDIR="\"$(localedir)\"" \
|
||||||
$(PYTHON_CPPFLAGS) \
|
$(PYTHON_CPPFLAGS) \
|
||||||
$(GLIBMM_CFLAGS)
|
$(GLIBMM_CFLAGS)
|
||||||
libbackend_la_LIBADD = $(PYTHON_LDFLAGS) \
|
libbackend_la_LIBADD = ../pyloader/libpyloader.la
|
||||||
$(PYTHON_EXTRA_LIBS)
|
libbackend_la_LDFLAGS = $(GLIBMM_LDFLAGS) \
|
||||||
libbackend_la_LDFLAGS = $(PYTHON_EXTRA_LDFLAGS) \
|
$(LT_LDFLAGS)
|
||||||
$(GLIBMM_LDFLAGS)
|
|
||||||
|
|
||||||
# Please keep this in sorted order:
|
# Please keep this in sorted order:
|
||||||
libbackend_la_SOURCES = \
|
libbackend_la_SOURCES = \
|
||||||
|
@ -53,8 +52,6 @@ libbackend_la_SOURCES = \
|
||||||
policy_manager.cc \
|
policy_manager.cc \
|
||||||
policy_parameters.cc \
|
policy_parameters.cc \
|
||||||
process.cc \
|
process.cc \
|
||||||
python_policy.cc \
|
|
||||||
python_policy_manager.cc \
|
|
||||||
schedulable.cc \
|
schedulable.cc \
|
||||||
schedulable_list.cc \
|
schedulable_list.cc \
|
||||||
schedulable_status.cc \
|
schedulable_status.cc \
|
||||||
|
@ -68,8 +65,6 @@ noinst_HEADERS = \
|
||||||
policy_manager.hh \
|
policy_manager.hh \
|
||||||
policy_parameters.hh \
|
policy_parameters.hh \
|
||||||
process.hh \
|
process.hh \
|
||||||
python_policy.hh \
|
|
||||||
python_policy_manager.hh \
|
|
||||||
schedulable.hh \
|
schedulable.hh \
|
||||||
schedulable_list.hh \
|
schedulable_list.hh \
|
||||||
schedulable_status.hh \
|
schedulable_status.hh \
|
||||||
|
|
|
@ -34,8 +34,8 @@
|
||||||
#include "backend/process.hh"
|
#include "backend/process.hh"
|
||||||
#include "backend/policy.hh"
|
#include "backend/policy.hh"
|
||||||
#include "backend/policy_parameters.hh"
|
#include "backend/policy_parameters.hh"
|
||||||
#include "backend/python_policy.hh"
|
#include "pyloader/python_policy.hh"
|
||||||
#include "backend/python_policy_manager.hh"
|
#include "pyloader/python_policy_manager.hh"
|
||||||
#include "standard_io.hh"
|
#include "standard_io.hh"
|
||||||
|
|
||||||
#include <glibmm/timer.h>
|
#include <glibmm/timer.h>
|
||||||
|
|
|
@ -38,18 +38,20 @@ libpyloader_la_CPPFLAGS = -I@top_srcdir@ \
|
||||||
-DPYCDIR="\"$(pycdir)\"" \
|
-DPYCDIR="\"$(pycdir)\"" \
|
||||||
-DMODDIR="\"$(moddir)\"" \
|
-DMODDIR="\"$(moddir)\"" \
|
||||||
-DLOCALEDIR="\"$(localedir)\"" \
|
-DLOCALEDIR="\"$(localedir)\"" \
|
||||||
$(PYTHON_CPPFLAGS)
|
$(PYTHON_CPPFLAGS) \
|
||||||
|
$(GLIBMM_CFLAGS)
|
||||||
libpyloader_la_LIBADD = $(PYTHON_LDFLAGS) \
|
libpyloader_la_LIBADD = $(PYTHON_LDFLAGS) \
|
||||||
$(PYTHON_EXTRA_LIBS)
|
$(PYTHON_EXTRA_LIBS) \
|
||||||
libpyloader_la_LDFLAGS = $(PYTHON_EXTRA_LDFLAGS)
|
$(GLIBMM_LIBS)
|
||||||
|
libpyloader_la_LDFLAGS = $(PYTHON_EXTRA_LDFLAGS) \
|
||||||
|
$(LT_LDFLAGS)
|
||||||
|
|
||||||
# Please keep this in sorted order:
|
# Please keep this in sorted order:
|
||||||
libpyloader_la_SOURCES = empty.cc
|
libpyloader_la_SOURCES = \
|
||||||
|
python_policy.cc \
|
||||||
|
python_policy_manager.cc
|
||||||
|
|
||||||
noinst_HEADERS =
|
noinst_HEADERS = python_policy.hh \
|
||||||
|
python_policy_manager.hh
|
||||||
|
|
||||||
# !! temp file for debug, will be deleted as soon as
|
|
||||||
# !! source's in place
|
|
||||||
empty.cc :
|
|
||||||
echo "int main() {}" > @builddir@/$@
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue