From 0c56e138e63986d8a8c0d7fc3e2c7230a020289e Mon Sep 17 00:00:00 2001 From: dagenais Date: Fri, 16 Apr 2004 18:52:30 +0000 Subject: [PATCH] Adjust the includes now that some paths have changed git-svn-id: http://ltt.polymtl.ca/svn@502 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt/branches/poly/Makefile.am | 2 +- ltt/branches/poly/configure.in | 5 +++- ltt/branches/poly/lttv/Makefile.am | 2 +- .../lttv/{processTrace.c => tracecontext.c} | 0 .../poly/lttv/modules/gui/Makefile.am | 2 +- .../lttv/modules/gui/controlflow/Makefile.am | 3 ++ .../poly/lttv/modules/gui/controlflow/cfv.h | 4 +-- .../lttv/modules/gui/controlflow/drawing.c | 2 +- .../lttv/modules/gui/controlflow/eventhooks.c | 4 +-- .../lttv/modules/gui/controlflow/eventhooks.h | 2 +- .../hGuiControlFlowInsert.xpm | 0 .../lttv/modules/gui/controlflow/module.c | 4 +-- .../modules/gui/detailedevents/Makefile.am | 2 ++ .../lttv/modules/gui/detailedevents/events.c | 4 +-- .../hGuiEventsInsert.xpm | 0 .../poly/lttv/modules/gui/icons/Makefile.am | 30 ------------------- .../gui/{mainlib => lttvgui}/Makefile.am | 0 .../modules/gui/{mainlib => lttvgui}/common.h | 2 +- .../gui/{mainlib => lttvgui}/gtkdirsel.h | 0 .../gui/{mainlib => lttvgui}/gtkmultivpaned.h | 2 +- .../gui/{mainlib => lttvgui}/gtktraceset.c | 10 +++---- .../gui/{mainlib => lttvgui}/gtktraceset.h | 2 +- .../gui/{mainlib => lttvgui}/lttvfilter.h | 0 .../gui/{mainlib => lttvgui}/mainwindow.h | 4 +-- .../modules/gui/{mainlib => lttvgui}/menu.c | 2 +- .../modules/gui/{mainlib => lttvgui}/menu.h | 2 +- .../gui/{mainlib => lttvgui}/toolbar.c | 2 +- .../gui/{mainlib => lttvgui}/toolbar.h | 2 +- .../poly/lttv/modules/gui/main/Makefile.am | 6 +--- .../lttv/modules/gui/main/glade/Makefile.am | 5 ++++ .../{mainwin.glade => glade/lttvwindow.glade} | 0 .../lttvwindow.gladep} | 0 .../lttv/modules/gui/main/src/callbacks.c | 12 ++++---- .../lttv/modules/gui/main/src/callbacks.h | 4 +-- .../lttv/modules/gui/main/src/gtkdirsel.c | 2 +- .../modules/gui/main/src/gtkmultivpaned.c | 6 ++-- .../lttv/modules/gui/main/src/init_module.c | 6 ++-- .../lttv/modules/gui/main/src/lttvfilter.c | 2 +- .../poly/lttv/modules/gui/main/src/main.c | 2 +- .../lttv/modules/gui/statistics/Makefile.am | 3 ++ .../hGuiStatisticInsert.xpm | 0 .../lttv/modules/gui/statistics/statistics.c | 6 ++-- 42 files changed, 65 insertions(+), 83 deletions(-) rename ltt/branches/poly/lttv/lttv/{processTrace.c => tracecontext.c} (100%) rename ltt/branches/poly/lttv/modules/gui/{icons => controlflow}/hGuiControlFlowInsert.xpm (100%) rename ltt/branches/poly/lttv/modules/gui/{icons => detailedevents}/hGuiEventsInsert.xpm (100%) delete mode 100644 ltt/branches/poly/lttv/modules/gui/icons/Makefile.am rename ltt/branches/poly/lttv/modules/gui/{mainlib => lttvgui}/Makefile.am (100%) rename ltt/branches/poly/lttv/modules/gui/{mainlib => lttvgui}/common.h (97%) rename ltt/branches/poly/lttv/modules/gui/{mainlib => lttvgui}/gtkdirsel.h (100%) rename ltt/branches/poly/lttv/modules/gui/{mainlib => lttvgui}/gtkmultivpaned.h (99%) rename ltt/branches/poly/lttv/modules/gui/{mainlib => lttvgui}/gtktraceset.c (99%) rename ltt/branches/poly/lttv/modules/gui/{mainlib => lttvgui}/gtktraceset.h (99%) rename ltt/branches/poly/lttv/modules/gui/{mainlib => lttvgui}/lttvfilter.h (100%) rename ltt/branches/poly/lttv/modules/gui/{mainlib => lttvgui}/mainwindow.h (97%) rename ltt/branches/poly/lttv/modules/gui/{mainlib => lttvgui}/menu.c (98%) rename ltt/branches/poly/lttv/modules/gui/{mainlib => lttvgui}/menu.h (97%) rename ltt/branches/poly/lttv/modules/gui/{mainlib => lttvgui}/toolbar.c (98%) rename ltt/branches/poly/lttv/modules/gui/{mainlib => lttvgui}/toolbar.h (97%) create mode 100644 ltt/branches/poly/lttv/modules/gui/main/glade/Makefile.am rename ltt/branches/poly/lttv/modules/gui/main/{mainwin.glade => glade/lttvwindow.glade} (100%) rename ltt/branches/poly/lttv/modules/gui/main/{mainwin.gladep => glade/lttvwindow.gladep} (100%) rename ltt/branches/poly/lttv/modules/gui/{icons => statistics}/hGuiStatisticInsert.xpm (100%) diff --git a/ltt/branches/poly/Makefile.am b/ltt/branches/poly/Makefile.am index 0dbabeb2..c249bbff 100644 --- a/ltt/branches/poly/Makefile.am +++ b/ltt/branches/poly/Makefile.am @@ -1,6 +1,6 @@ # WARNING : ltt must come before lttv, so that the traceread library is # up to date -SUBDIRS = ltt include lttv lttd +SUBDIRS = ltt lttv lttd diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in index f245ffd3..638a52b7 100644 --- a/ltt/branches/poly/configure.in +++ b/ltt/branches/poly/configure.in @@ -77,10 +77,13 @@ lttlibdir="${libdir}/ltt" AC_SUBST(lttlibdir) +top_lttvdir="\$(top_srcdir)/lttv" +AC_SUBST(top_lttvdir) + top_guidir="\$(top_srcdir)/lttv/modules/gui" AC_SUBST(top_guidir) -DEFAULT_INCLUDES="-I\$(top_guidir) -I\$(top_srcdir)" +DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_lttvdir) -I\$(top_guidir)" AC_SUBST(DEFAULT_INCLUDES) #CPPFLAGS="${GLIB_CFLAGS}" diff --git a/ltt/branches/poly/lttv/Makefile.am b/ltt/branches/poly/lttv/Makefile.am index 9f26d16e..8370b90a 100644 --- a/ltt/branches/poly/lttv/Makefile.am +++ b/ltt/branches/poly/lttv/Makefile.am @@ -1,4 +1,4 @@ # WARNING : modules must be done at the end, so modules can dynamically link # themselves to libraries compiled here but not installed in the system. -SUBDIRS = main modules +SUBDIRS = lttv modules diff --git a/ltt/branches/poly/lttv/lttv/processTrace.c b/ltt/branches/poly/lttv/lttv/tracecontext.c similarity index 100% rename from ltt/branches/poly/lttv/lttv/processTrace.c rename to ltt/branches/poly/lttv/lttv/tracecontext.c diff --git a/ltt/branches/poly/lttv/modules/gui/Makefile.am b/ltt/branches/poly/lttv/modules/gui/Makefile.am index bcbf41b8..7b3fd205 100644 --- a/ltt/branches/poly/lttv/modules/gui/Makefile.am +++ b/ltt/branches/poly/lttv/modules/gui/Makefile.am @@ -6,5 +6,5 @@ # WARNING : subdirs order is important : mainWin depends on API -SUBDIRS = mainlib main icons controlflow detailedevents statistics +SUBDIRS = lttvgui lttvwindow controlflow detailedevents statistics diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am b/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am index 2ec98b80..6938e2ff 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am @@ -36,3 +36,6 @@ libguicontrolflow_la_SOURCES = module.c eventhooks.c cfv.c processlist.c\ noinst_HEADERS = eventhooks.h cfv.h cfv-private.h processlist.h\ drawing.h drawitem.h + +EXTRA_DIST = \ + hGuiControlFlowInsert.xpm \ No newline at end of file diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.h b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.h index 30015c36..928936d5 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.h +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.h @@ -22,8 +22,8 @@ #define _CFV_H #include -#include -#include +#include +#include #include "processlist.h" typedef struct _ControlFlowData ControlFlowData; diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c index 7f4ee2f4..bc2297ca 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include "drawing.h" diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c index 8b990961..38748bed 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c @@ -38,9 +38,9 @@ #include #include -#include +#include #include -#include +#include #include "eventhooks.h" diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.h b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.h index fdb9edd0..134307bd 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.h +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.h @@ -27,7 +27,7 @@ #define _EVENT_HOOKS_H #include -#include +#include #include #include "processlist.h" diff --git a/ltt/branches/poly/lttv/modules/gui/icons/hGuiControlFlowInsert.xpm b/ltt/branches/poly/lttv/modules/gui/controlflow/hGuiControlFlowInsert.xpm similarity index 100% rename from ltt/branches/poly/lttv/modules/gui/icons/hGuiControlFlowInsert.xpm rename to ltt/branches/poly/lttv/modules/gui/controlflow/hGuiControlFlowInsert.xpm diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c index 69694d6f..5b9751d5 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c @@ -40,12 +40,12 @@ #include #include #include -#include +#include #include "cfv.h" #include "eventhooks.h" -#include "../icons/hGuiControlFlowInsert.xpm" +#include "hGuiControlFlowInsert.xpm" static LttvModule *Main_Win_Module; diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am b/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am index b5808cc3..527db859 100644 --- a/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am +++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am @@ -35,3 +35,5 @@ libguievents_la_LDFLAGS = -module libguievents_la_SOURCES = events.c noinst_HEADERS = gtkrbtree.h gtktreeprivate.h +EXTRA_DIST = \ + hGuiEventsInsert.xpm \ No newline at end of file diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c index 51d51aa1..2b2ceaad 100644 --- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c +++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include #include @@ -58,7 +58,7 @@ //#include "mw_api.h" #include "gtktreeprivate.h" -#include "../icons/hGuiEventsInsert.xpm" +#include "hGuiEventsInsert.xpm" static LttvHooks *before_event; diff --git a/ltt/branches/poly/lttv/modules/gui/icons/hGuiEventsInsert.xpm b/ltt/branches/poly/lttv/modules/gui/detailedevents/hGuiEventsInsert.xpm similarity index 100% rename from ltt/branches/poly/lttv/modules/gui/icons/hGuiEventsInsert.xpm rename to ltt/branches/poly/lttv/modules/gui/detailedevents/hGuiEventsInsert.xpm diff --git a/ltt/branches/poly/lttv/modules/gui/icons/Makefile.am b/ltt/branches/poly/lttv/modules/gui/icons/Makefile.am deleted file mode 100644 index 2363c363..00000000 --- a/ltt/branches/poly/lttv/modules/gui/icons/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# This file is part of the Linux Trace Toolkit viewer -# Copyright (C) 2003-2004 Mathieu Desnoyers -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation; -# -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, -# MA 02111-1307, USA. - - - -# -# Makefile for LTT New generation user interface. -# -# Created by Mathieu Desnoyers on May 6, 2003 -# - -EXTRA_DIST = \ - hGuiControlFlowInsert.xpm\ - hGuiEventsInsert.xpm\ - hGuiStatisticInsert.xpm - diff --git a/ltt/branches/poly/lttv/modules/gui/mainlib/Makefile.am b/ltt/branches/poly/lttv/modules/gui/lttvgui/Makefile.am similarity index 100% rename from ltt/branches/poly/lttv/modules/gui/mainlib/Makefile.am rename to ltt/branches/poly/lttv/modules/gui/lttvgui/Makefile.am diff --git a/ltt/branches/poly/lttv/modules/gui/mainlib/common.h b/ltt/branches/poly/lttv/modules/gui/lttvgui/common.h similarity index 97% rename from ltt/branches/poly/lttv/modules/gui/mainlib/common.h rename to ltt/branches/poly/lttv/modules/gui/lttvgui/common.h index a3e557f3..5ec75179 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainlib/common.h +++ b/ltt/branches/poly/lttv/modules/gui/lttvgui/common.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #define MAX_NUMBER_EVENT "MAX_NUMBER_EVENT" #define TRACESET_TIME_SPAN "TRACESET_TIME_SPAN" diff --git a/ltt/branches/poly/lttv/modules/gui/mainlib/gtkdirsel.h b/ltt/branches/poly/lttv/modules/gui/lttvgui/gtkdirsel.h similarity index 100% rename from ltt/branches/poly/lttv/modules/gui/mainlib/gtkdirsel.h rename to ltt/branches/poly/lttv/modules/gui/lttvgui/gtkdirsel.h diff --git a/ltt/branches/poly/lttv/modules/gui/mainlib/gtkmultivpaned.h b/ltt/branches/poly/lttv/modules/gui/lttvgui/gtkmultivpaned.h similarity index 99% rename from ltt/branches/poly/lttv/modules/gui/mainlib/gtkmultivpaned.h rename to ltt/branches/poly/lttv/modules/gui/lttvgui/gtkmultivpaned.h index ff8334e2..f6ab2e49 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainlib/gtkmultivpaned.h +++ b/ltt/branches/poly/lttv/modules/gui/lttvgui/gtkmultivpaned.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/ltt/branches/poly/lttv/modules/gui/mainlib/gtktraceset.c b/ltt/branches/poly/lttv/modules/gui/lttvgui/gtktraceset.c similarity index 99% rename from ltt/branches/poly/lttv/modules/gui/mainlib/gtktraceset.c rename to ltt/branches/poly/lttv/modules/gui/lttvgui/gtktraceset.c index 772583f9..e82d4c0d 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainlib/gtktraceset.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvgui/gtktraceset.c @@ -28,14 +28,14 @@ * */ -#include +#include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include diff --git a/ltt/branches/poly/lttv/modules/gui/mainlib/gtktraceset.h b/ltt/branches/poly/lttv/modules/gui/lttvgui/gtktraceset.h similarity index 99% rename from ltt/branches/poly/lttv/modules/gui/mainlib/gtktraceset.h rename to ltt/branches/poly/lttv/modules/gui/lttvgui/gtktraceset.h index 19035482..a0b08f2b 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainlib/gtktraceset.h +++ b/ltt/branches/poly/lttv/modules/gui/lttvgui/gtktraceset.h @@ -59,7 +59,7 @@ set_hpane_dividor #include #include #include -#include +#include #include /** diff --git a/ltt/branches/poly/lttv/modules/gui/mainlib/lttvfilter.h b/ltt/branches/poly/lttv/modules/gui/lttvgui/lttvfilter.h similarity index 100% rename from ltt/branches/poly/lttv/modules/gui/mainlib/lttvfilter.h rename to ltt/branches/poly/lttv/modules/gui/lttvgui/lttvfilter.h diff --git a/ltt/branches/poly/lttv/modules/gui/mainlib/mainwindow.h b/ltt/branches/poly/lttv/modules/gui/lttvgui/mainwindow.h similarity index 97% rename from ltt/branches/poly/lttv/modules/gui/mainlib/mainwindow.h rename to ltt/branches/poly/lttv/modules/gui/lttvgui/mainwindow.h index 8ef8defb..cf0925c4 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainlib/mainwindow.h +++ b/ltt/branches/poly/lttv/modules/gui/lttvgui/mainwindow.h @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/ltt/branches/poly/lttv/modules/gui/mainlib/menu.c b/ltt/branches/poly/lttv/modules/gui/lttvgui/menu.c similarity index 98% rename from ltt/branches/poly/lttv/modules/gui/mainlib/menu.c rename to ltt/branches/poly/lttv/modules/gui/lttvgui/menu.c index 22dcd016..827f843b 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainlib/menu.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvgui/menu.c @@ -17,7 +17,7 @@ */ #include -#include +#include inline LttvMenus *lttv_menus_new() { diff --git a/ltt/branches/poly/lttv/modules/gui/mainlib/menu.h b/ltt/branches/poly/lttv/modules/gui/lttvgui/menu.h similarity index 97% rename from ltt/branches/poly/lttv/modules/gui/mainlib/menu.h rename to ltt/branches/poly/lttv/modules/gui/lttvgui/menu.h index ec20c099..d08572c5 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainlib/menu.h +++ b/ltt/branches/poly/lttv/modules/gui/lttvgui/menu.h @@ -19,7 +19,7 @@ #ifndef MENU_H #define MENU_H -#include +#include /* constructor of the viewer */ //typedef GtkWidget* (*lttv_constructor)(void * main_window); diff --git a/ltt/branches/poly/lttv/modules/gui/mainlib/toolbar.c b/ltt/branches/poly/lttv/modules/gui/lttvgui/toolbar.c similarity index 98% rename from ltt/branches/poly/lttv/modules/gui/mainlib/toolbar.c rename to ltt/branches/poly/lttv/modules/gui/lttvgui/toolbar.c index cacd8d8d..cfb4dda0 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainlib/toolbar.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvgui/toolbar.c @@ -17,7 +17,7 @@ */ #include -#include +#include inline LttvToolbars *lttv_toolbars_new() { diff --git a/ltt/branches/poly/lttv/modules/gui/mainlib/toolbar.h b/ltt/branches/poly/lttv/modules/gui/lttvgui/toolbar.h similarity index 97% rename from ltt/branches/poly/lttv/modules/gui/mainlib/toolbar.h rename to ltt/branches/poly/lttv/modules/gui/lttvgui/toolbar.h index af12d937..8a8815ad 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainlib/toolbar.h +++ b/ltt/branches/poly/lttv/modules/gui/lttvgui/toolbar.h @@ -19,7 +19,7 @@ #ifndef TOOLBAR_H #define TOOLBAR_H -#include +#include /* constructor of the viewer */ //typedef GtkWidget* (*lttv_constructor)(void * main_window); diff --git a/ltt/branches/poly/lttv/modules/gui/main/Makefile.am b/ltt/branches/poly/lttv/modules/gui/main/Makefile.am index 687919f3..7e90b8f2 100644 --- a/ltt/branches/poly/lttv/modules/gui/main/Makefile.am +++ b/ltt/branches/poly/lttv/modules/gui/main/Makefile.am @@ -1,10 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = src - -EXTRA_DIST = \ - mainwin.glade \ - mainwin.gladep +SUBDIRS = src glade install-data-local: @$(NORMAL_INSTALL) diff --git a/ltt/branches/poly/lttv/modules/gui/main/glade/Makefile.am b/ltt/branches/poly/lttv/modules/gui/main/glade/Makefile.am new file mode 100644 index 00000000..c375abfa --- /dev/null +++ b/ltt/branches/poly/lttv/modules/gui/main/glade/Makefile.am @@ -0,0 +1,5 @@ +## Process this file with automake to produce Makefile.in + +EXTRA_DIST = \ + mainwin.glade \ + mainwin.gladep diff --git a/ltt/branches/poly/lttv/modules/gui/main/mainwin.glade b/ltt/branches/poly/lttv/modules/gui/main/glade/lttvwindow.glade similarity index 100% rename from ltt/branches/poly/lttv/modules/gui/main/mainwin.glade rename to ltt/branches/poly/lttv/modules/gui/main/glade/lttvwindow.glade diff --git a/ltt/branches/poly/lttv/modules/gui/main/mainwin.gladep b/ltt/branches/poly/lttv/modules/gui/main/glade/lttvwindow.gladep similarity index 100% rename from ltt/branches/poly/lttv/modules/gui/main/mainwin.gladep rename to ltt/branches/poly/lttv/modules/gui/main/glade/lttvwindow.gladep diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/callbacks.c b/ltt/branches/poly/lttv/modules/gui/main/src/callbacks.c index 8bc265ce..76890d15 100644 --- a/ltt/branches/poly/lttv/modules/gui/main/src/callbacks.c +++ b/ltt/branches/poly/lttv/modules/gui/main/src/callbacks.c @@ -26,14 +26,14 @@ #include "interface.h" #include "support.h" #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include -#include +#include #include #include diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/callbacks.h b/ltt/branches/poly/lttv/modules/gui/main/src/callbacks.h index c9166bda..2ec6b0bf 100644 --- a/ltt/branches/poly/lttv/modules/gui/main/src/callbacks.h +++ b/ltt/branches/poly/lttv/modules/gui/main/src/callbacks.h @@ -17,8 +17,8 @@ */ #include -#include -#include +#include +#include /* internal functions */ diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/gtkdirsel.c b/ltt/branches/poly/lttv/modules/gui/main/src/gtkdirsel.c index e17ed4c8..138d9750 100644 --- a/ltt/branches/poly/lttv/modules/gui/main/src/gtkdirsel.c +++ b/ltt/branches/poly/lttv/modules/gui/main/src/gtkdirsel.c @@ -49,7 +49,7 @@ #include "gdk/gdkkeysyms.h" #include -#include +#include #define _(A) A #define WANT_HPANED 1 diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/gtkmultivpaned.c b/ltt/branches/poly/lttv/modules/gui/main/src/gtkmultivpaned.c index 6ce5eb97..6bf873a4 100644 --- a/ltt/branches/poly/lttv/modules/gui/main/src/gtkmultivpaned.c +++ b/ltt/branches/poly/lttv/modules/gui/main/src/gtkmultivpaned.c @@ -18,10 +18,10 @@ #include -#include +#include //#include "gtkintl.h" -#include -#include +#include +#include static void gtk_multi_vpaned_class_init (GtkMultiVPanedClass *klass); static void gtk_multi_vpaned_init (GtkMultiVPaned *multi_vpaned); diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/init_module.c b/ltt/branches/poly/lttv/modules/gui/main/src/init_module.c index c1fcf1fc..31fb5923 100644 --- a/ltt/branches/poly/lttv/modules/gui/main/src/init_module.c +++ b/ltt/branches/poly/lttv/modules/gui/main/src/init_module.c @@ -35,12 +35,12 @@ #include #include #include -#include -#include +#include +#include #include "interface.h" #include "support.h" -#include +#include #include "callbacks.h" #include diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/lttvfilter.c b/ltt/branches/poly/lttv/modules/gui/main/src/lttvfilter.c index 71262722..e81e82ab 100644 --- a/ltt/branches/poly/lttv/modules/gui/main/src/lttvfilter.c +++ b/ltt/branches/poly/lttv/modules/gui/main/src/lttvfilter.c @@ -17,7 +17,7 @@ */ -#include +#include #include #include #include diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/main.c b/ltt/branches/poly/lttv/modules/gui/main/src/main.c index 46044437..854839f5 100644 --- a/ltt/branches/poly/lttv/modules/gui/main/src/main.c +++ b/ltt/branches/poly/lttv/modules/gui/main/src/main.c @@ -12,7 +12,7 @@ #include "interface.h" #include "support.h" -#include +#include #include "callbacks.h" /* global variable */ diff --git a/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am b/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am index 602621ba..f15a5b9f 100644 --- a/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am +++ b/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am @@ -14,3 +14,6 @@ libdir = ${lttvplugindir} lib_LTLIBRARIES = libguistatistics.la libguistatistics_la_LDFLAGS = -module libguistatistics_la_SOURCES = statistics.c + +EXTRA_DIST = \ + hGuiStatisticInsert.xpm \ No newline at end of file diff --git a/ltt/branches/poly/lttv/modules/gui/icons/hGuiStatisticInsert.xpm b/ltt/branches/poly/lttv/modules/gui/statistics/hGuiStatisticInsert.xpm similarity index 100% rename from ltt/branches/poly/lttv/modules/gui/icons/hGuiStatisticInsert.xpm rename to ltt/branches/poly/lttv/modules/gui/statistics/hGuiStatisticInsert.xpm diff --git a/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c b/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c index 92cee3cc..d1726c00 100644 --- a/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c +++ b/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c @@ -22,10 +22,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include @@ -36,7 +36,7 @@ #include -#include "../icons/hGuiStatisticInsert.xpm" +#include "hGuiStatisticInsert.xpm" #define PATH_LENGTH 256 /* CHECK */ -- 2.34.1