Commit 125e5b09 authored by Richard Hult's avatar Richard Hult

Clean up build.

parent bc476548
2005-04-16 Richard Hult <richard@imendio.com>
* autogen.sh:
* data/Makefile.am:
* libplanner/Makefile.am:
* libplanner/mrp-marshal-main.c:
* python/Makefile.am:
* src/Makefile.am:
* src/planner-marshal-main.c:
* src/planner-usage-view.c: Clean up and build.
2005-04-16 Richard Hult <richard@imendio.com>
* src/planner-usage-*: Rename from planner-ttable-*.
......
......@@ -47,7 +47,7 @@ fi
($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have automake 1.7.x installed to compile $PROJECT."
echo "You must have automake 1.9.x installed to compile $PROJECT."
echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
DIE=1
......@@ -56,7 +56,7 @@ fi
(grep "^AM_PROG_LIBTOOL" configure.in >/dev/null) && {
($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have libtool 1.4 installed to compile $PROJECT."
echo "You must have libtool 1.5 installed to compile $PROJECT."
echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
echo "(or a newer version if it is available)"
......
......@@ -19,7 +19,7 @@ endif
EXTRA_DIST = \
planner.desktop.in \
$(schema_DATA)
$(schema_in_files)
CLEANFILES = $(desktop_DATA)
DISTCLEANFILES = $(schema_DATA)
INCLUDES = \
-I. -I$(top_srcdir) \
-I$(top_srcdir) \
-I$(top_srcdir)/libplanner \
-I$(top_builddir) \
-I$(top_builddir)/libplanner \
$(LIBPLANNER_CFLAGS) $(WARN_CFLAGS) \
-DMRP_STORAGEMODULEDIR=\""$(libdir)/planner/storage-modules"\" \
-DMRP_FILE_MODULES_DIR=\""$(libdir)/planner/file-modules"\" \
......@@ -7,8 +10,8 @@ INCLUDES = \
lib_LTLIBRARIES = libplanner-1.la
libplanner_1_la_SOURCES = \
mrp-marshal-main.c \
libplanner_1_la_SOURCES = \
$(built_sources) \
mrp-application.c \
mrp-assignment.c \
mrp-calendar.c \
......@@ -32,7 +35,7 @@ libplanner_1_la_SOURCES = \
mrp-time.c \
mrp-error.c
libplannerinclude_HEADERS = \
libplannerinclude_HEADERS = \
planner.h \
mrp-application.h \
mrp-assignment.h \
......@@ -52,8 +55,6 @@ libplannerinclude_HEADERS = \
libplanner_1_la_LIBADD = $(LIBPLANNER_LIBS)
# -export-symbols-regex "^[^_].*"
libplannerincludedir = $(includedir)/planner-1.0/libplanner
#
......@@ -66,23 +67,23 @@ if HAVE_GDA
sql_library = libstorage-sql.la
endif
storagemodule_LTLIBRARIES = \
libstorage-mrproject-1.la \
storagemodule_LTLIBRARIES = \
libstorage-mrproject-1.la \
$(sql_library)
libstorage_mrproject_1_la_SOURCES = \
mrp-storage-mrproject.c \
mrp-storage-mrproject.h \
mrp-parser.c \
libstorage_mrproject_1_la_SOURCES = \
mrp-storage-mrproject.c \
mrp-storage-mrproject.h \
mrp-parser.c \
mrp-parser.h
libstorage_mrproject_1_la_LDFLAGS = -avoid-version -module
if HAVE_GDA
libstorage_sql_la_SOURCES = \
mrp-storage-sql.c \
mrp-storage-sql.h \
mrp-sql.c \
libstorage_sql_la_SOURCES = \
mrp-storage-sql.c \
mrp-storage-sql.h \
mrp-sql.c \
mrp-sql.h
libstorage_sql_la_LDFLAGS = -avoid-version -module
......@@ -96,49 +97,47 @@ endif
filemoduledir = $(libdir)/planner/file-modules
filemodule_LTLIBRARIES = \
libmrp-xml.la \
filemodule_LTLIBRARIES = \
libmrp-xml.la \
libmrp-xsl.la
# libmrp-mpx.la
libmrp_xml_la_SOURCES = \
mrp-xml.c \
mrp-old-xml.c \
libmrp_xml_la_SOURCES = \
mrp-xml.c \
mrp-old-xml.c \
mrp-old-xml.h
libmrp_xml_la_CFLAGS = -DDTDDIR=\""$(datadir)/planner/dtd"\"
libmrp_xml_la_LDFLAGS = -avoid-version -module
libmrp_xsl_la_SOURCES = \
mrp-xsl.c
libmrp_xsl_la_CFLAGS = \
$(XSLT_CFLAGS) \
-DSTYLESHEETDIR=\""$(datadir)/planner/stylesheets"\"
libmrp_xsl_la_SOURCES = mrp-xsl.c
libmrp_xsl_la_CFLAGS = $(XSLT_CFLAGS) -DSTYLESHEETDIR=\""$(datadir)/planner/stylesheets"\"
libmrp_xsl_la_LIBADD = $(XSLT_LIBS)
libmrp_xsl_la_LDFLAGS = -avoid-version -module
#mrp-marshal.h: Makefile.am mrp-marshal.list
# (cd $(srcdir) && \
# @GLIB_GENMARSHAL@ --prefix=mrp_marshal mrp-marshal.list --header) > xgen-gmh \
# && (cmp -s xgen-gmh mrp-marshal.h || cp xgen-gmh mrp-marshal.h) \
# && rm -f xgen-gmh xgen-gmh~
#libmrp_mpx_la_SOURCES = \
# mrp-mpx.c
#libmrp_mpx_la_LDFLAGS = -avoid-version -module
#mrp-marshal.c: Makefile.am mrp-marshal.list
# (cd $(srcdir) && \
# @GLIB_GENMARSHAL@ --prefix=mrp_marshal mrp-marshal.list --body) > xgen-gmc \
# && cp xgen-gmc mrp-marshal.c \
# && rm -f xgen-gmc xgen-gmc~
mrp-marshal.h: Makefile.am mrp-marshal.list
(cd $(srcdir) && \
@GLIB_GENMARSHAL@ --prefix=mrp_marshal mrp-marshal.list --header) > xgen-gmh \
$(GLIB_GENMARSHAL) --prefix=mrp_marshal $(srcdir)/mrp-marshal.list --header > xgen-gmh \
&& (cmp -s xgen-gmh mrp-marshal.h || cp xgen-gmh mrp-marshal.h) \
&& rm -f xgen-gmh xgen-gmh~
mrp-marshal.c: Makefile.am mrp-marshal.list
(cd $(srcdir) && \
@GLIB_GENMARSHAL@ --prefix=mrp_marshal mrp-marshal.list --body) > xgen-gmc \
(echo "#include \"mrp-marshal.h\""; $(GLIB_GENMARSHAL) --prefix=mrp_marshal $(srcdir)/mrp-marshal.list --body) > xgen-gmc \
&& cp xgen-gmc mrp-marshal.c \
&& rm -f xgen-gmc xgen-gmc~
mrp-marshal-main.c: mrp-marshal.c mrp-marshal.h
#$(top_srcdir)/mrp-marshal-main.c: $(built_sources)
# do not use BUILT_SOURCES because of weird semantics
# i *think* these should actually be stamp-* files
......
#include "mrp-marshal.h"
#include "mrp-marshal.c"
2005-04-16 Richard Hult <richard@imendio.com>
* POTFILES.in: Remove file.
* POTFILES.in:
* POTFILES.skip: Clean up.
2005-04-15 Miloslav Trmac <mitr@volny.cz>
......
......@@ -91,7 +91,6 @@ src/planner-task-dialog.c
src/planner-task-popup.c
src/planner-task-tree.c
src/planner-task-view.c
src/planner-usage-print.c
src/planner-usage-row.c
src/planner-usage-tree.c
src/planner-usage-view.c
......
......@@ -9,3 +9,4 @@ data/planner.desktop.in
eds-backend/e-cal-backend-planner.c
eds-backend/planner-source/planner-source.c
src/planner-usage-print.c
NULL =
INCLUDES = \
-I../src/ \
-I$(top_srcdir) \
-I$(top_srcdir)/src/
$(PYTHON_INCLUDES) \
$(PYGTK_CFLAGS) \
$(PLANNER_CFLAGS) \
$(NULL)
$(PLANNER_CFLAGS)
pkgpythondir = $(pythondir)/gtk-2.0
pkgpyexecdir = $(pyexecdir)/gtk-2.0
......
INCLUDES = \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_builddir) \
-I$(top_builddir)/src \
$(PLANNER_CFLAGS) $(WARN_CFLAGS) \
-DG_LOG_DOMAIN=\"Planner\" \
-DPREFIX=\""$(prefix)"\" \
......@@ -9,7 +11,7 @@ INCLUDES = \
-DDATADIR=\""$(datadir)"\" \
-DIMAGEDIR=\""$(datadir)/pixmaps/planner"\" \
-DGLADEDIR=\""$(datadir)/planner/glade"\" \
-DVIEWDIR=\""$(libdir)/planner/views"\" \
-DPLUGINDIR=\""$(libdir)/planner/plugins"\" \
-DSTYLESHEETDIR=\""$(datadir)/planner/stylesheets"\" \
-DDTDDIR=\""$(datadir)/planner/dtd"\"
......@@ -19,7 +21,8 @@ endif
bin_PROGRAMS = planner
planner_SOURCES = \
planner_SOURCES = \
$(built_sources) \
eel-canvas-rect.c \
eel-canvas-rect.h \
planner-application.c \
......@@ -59,7 +62,6 @@ planner_SOURCES = \
planner-list-model.c \
planner-list-model.h \
planner-main.c \
planner-marshal-main.c \
planner-phase-dialog.c \
planner-phase-dialog.h \
planner-plugin.c \
......@@ -143,6 +145,7 @@ resource_source = \
usage_source = \
planner-usage-view.c \
planner-usage-view.h \
planner-usage-chart.c \
planner-usage-chart.h \
planner-usage-model.c \
......@@ -188,7 +191,7 @@ libeds_plugin_la_LIBADD = $(EDS_LIBS)
libeds_plugin_la_CFLAGS = $(EDS_CFLAGS)
endif
plugin_LTLIBRARIES = \
plugin_LTLIBRARIES = \
libhtml-plugin.la \
libxmlplanner-plugin.la \
libmsp-plugin.la \
......@@ -206,26 +209,19 @@ libmsp_plugin_la_SOURCES = planner-msp-plugin.c
libmsp_plugin_la_LDFLAGS = -avoid-version -module
planner-marshal.h: Makefile.am planner-marshal.list
(cd $(srcdir) && \
@GLIB_GENMARSHAL@ --prefix=planner_marshal planner-marshal.list --header) > xgen-gmh \
$(GLIB_GENMARSHAL) --prefix=planner_marshal $(srcdir)/planner-marshal.list --header > xgen-gmh \
&& (cmp -s xgen-gmh planner-marshal.h || cp xgen-gmh planner-marshal.h) \
&& rm -f xgen-gmh xgen-gmh~
planner-marshal.c: Makefile.am planner-marshal.list
(cd $(srcdir) && \
@GLIB_GENMARSHAL@ --prefix=planner_marshal planner-marshal.list --body) > xgen-gmc \
(echo "#include \"planner-marshal.h\""; $(GLIB_GENMARSHAL) --prefix=planner_marshal $(srcdir)/planner-marshal.list --body) > xgen-gmc \
&& cp xgen-gmc planner-marshal.c \
&& rm -f xgen-gmc xgen-gmc~
planner-marshal-main.c: $(built_sources)
# do not use BUILT_SOURCES because of weird semantics
# i *think* these should actually be stamp-* files
built_sources = planner-marshal.h planner-marshal.c
# an explicit dependency here so all generated files get built
$(SOURCES): $(built_sources)
EXTRA_DIST = planner-marshal.list
CLEANFILES = $(built_sources)
#include "planner-marshal.h"
#include "planner-marshal.c"
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2003-2004 Imendio AB
* Copyright (C) 2003-2005 Imendio AB
* Copyright (C) 2003 Benjamin BAYART <benjamin@sitadelle.com>
* Copyright (C) 2003 Xavier Ordoquy <xordoquy@wanadoo.fr>
*
......@@ -26,7 +26,7 @@
#include <libplanner/mrp-task.h>
#include <libplanner/mrp-resource.h>
#include "planner-usage-view.h"
#include "planner-usage-print.h"
/*#include "planner-usage-print.h"*/
#include "planner-usage-model.h"
#include "planner-usage-tree.h"
#include "planner-usage-chart.h"
......@@ -37,55 +37,56 @@ struct _PlannerUsageViewPriv {
MrpProject *project;
PlannerUsageChart *chart;
PlannerUsagePrintData *print_data;
/*PlannerUsagePrintData *print_data;*/
GtkUIManager *ui_manager;
GtkActionGroup *actions;
guint merged_id;
};
static void usage_view_zoom_out_cb (GtkAction *action,
gpointer data);
static void usage_view_zoom_in_cb (GtkAction *action,
gpointer data);
static void usage_view_zoom_to_fit_cb (GtkAction *action,
gpointer data);
static GtkWidget *usage_view_create_widget (PlannerView *view);
static void usage_view_project_loaded_cb (MrpProject *project,
PlannerView *view);
static void usage_view_tree_style_set_cb (GtkWidget *tree,
GtkStyle *prev_style,
PlannerView *view);
static void usage_view_row_expanded (GtkTreeView *tree_view,
GtkTreeIter *iter,
GtkTreePath *path,
gpointer data);
static void usage_view_row_collapsed (GtkTreeView *tree_view,
GtkTreeIter *iter,
GtkTreePath *path,
gpointer data);
static void usage_view_expand_all (PlannerUsageTree *tree,
PlannerUsageChart *chart);
static void usage_view_collapse_all (PlannerUsageTree *tree,
PlannerUsageChart *chart);
static void usage_view_usage_status_updated (PlannerUsageChart *chart,
const gchar *message,
PlannerView *view);
static void usage_view_update_zoom_sensitivity (PlannerView *view);
static void usage_view_activate (PlannerView *view);
static void usage_view_deactivate (PlannerView *view);
static void usage_view_setup (PlannerView *view,
PlannerWindow *window);
static const gchar * usage_view_get_label (PlannerView *view);
static const gchar * usage_view_get_menu_label (PlannerView *view);
static const gchar * usage_view_get_icon (PlannerView *view);
static const gchar * usage_view_get_name (PlannerView *view);
static GtkWidget * usage_view_get_widget (PlannerView *view);
static void usage_view_print_init (PlannerView *view,
PlannerPrintJob *job);
static void usage_view_print (PlannerView *view);
static gint usage_view_print_get_n_pages (PlannerView *view);
static void usage_view_print_cleanup (PlannerView *view);
static void usage_view_zoom_out_cb (GtkAction *action,
gpointer data);
static void usage_view_zoom_in_cb (GtkAction *action,
gpointer data);
static void usage_view_zoom_to_fit_cb (GtkAction *action,
gpointer data);
static GtkWidget * usage_view_create_widget (PlannerView *view);
static void usage_view_project_loaded_cb (MrpProject *project,
PlannerView *view);
static void usage_view_tree_style_set_cb (GtkWidget *tree,
GtkStyle *prev_style,
PlannerView *view);
static void usage_view_row_expanded (GtkTreeView *tree_view,
GtkTreeIter *iter,
GtkTreePath *path,
gpointer data);
static void usage_view_row_collapsed (GtkTreeView *tree_view,
GtkTreeIter *iter,
GtkTreePath *path,
gpointer data);
static void usage_view_expand_all (PlannerUsageTree *tree,
PlannerUsageChart *chart);
static void usage_view_collapse_all (PlannerUsageTree *tree,
PlannerUsageChart *chart);
static void usage_view_usage_status_updated (PlannerUsageChart *chart,
const gchar *message,
PlannerView *view);
static void usage_view_update_zoom_sensitivity (PlannerView *view);
static void usage_view_activate (PlannerView *view);
static void usage_view_deactivate (PlannerView *view);
static void usage_view_setup (PlannerView *view,
PlannerWindow *window);
static const gchar *usage_view_get_label (PlannerView *view);
static const gchar *usage_view_get_menu_label (PlannerView *view);
static const gchar *usage_view_get_icon (PlannerView *view);
static const gchar *usage_view_get_name (PlannerView *view);
static GtkWidget * usage_view_get_widget (PlannerView *view);
static void usage_view_print_init (PlannerView *view,
PlannerPrintJob *job);
static void usage_view_print (PlannerView *view);
static gint usage_view_print_get_n_pages (PlannerView *view);
static void usage_view_print_cleanup (PlannerView *view);
......@@ -241,8 +242,7 @@ static void
usage_view_print_cleanup (PlannerView *view)
{
/*planner_usage_print_data_free (PLANNER_USAGE_VIEW (view)->priv->print_data);*/
PLANNER_USAGE_VIEW (view)->priv->print_data = NULL;
/*PLANNER_USAGE_VIEW (view)->priv->print_data = NULL;*/
}
static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment