From cef97e7c926bfe509b0b58d9c38bab60d30c81f8 Mon Sep 17 00:00:00 2001 From: yangxx Date: Fri, 30 Jan 2004 14:56:28 +0000 Subject: [PATCH] git-svn-id: http://ltt.polymtl.ca/svn@459 04897980-b3bd-0310-b5e0-8ef037075253 --- .../lttv/modules/gui/controlflow/Makefile.am | 2 +- .../lttv/modules/gui/controlflow/drawing.c | 2 +- .../lttv/modules/gui/controlflow/eventhooks.c | 2 +- .../lttv/modules/gui/controlflow/module.c | 2 +- .../modules/gui/detailedevents/Makefile.am | 2 +- .../lttv/modules/gui/detailedevents/events.c | 2 +- .../lttv/modules/gui/main/src/Makefile.am | 2 +- .../lttv/modules/gui/main/src/callbacks.c | 2 +- .../modules/gui/main/src/gtkmultivpaned.c | 2 +- .../poly/lttv/modules/gui/mainlib/Makefile.am | 6 ++--- .../mainlib/{gtkTraceSet.c => gtktraceset.c} | 22 +++++++++++++++++-- .../poly/lttv/modules/gui/mainlib/menu.c | 18 +++++++++++++++ .../poly/lttv/modules/gui/mainlib/toolbar.c | 18 +++++++++++++++ .../lttv/modules/gui/statistics/Makefile.am | 2 +- .../lttv/modules/gui/statistics/statistics.c | 2 +- 15 files changed, 70 insertions(+), 16 deletions(-) rename ltt/branches/poly/lttv/modules/gui/mainlib/{gtkTraceSet.c => gtktraceset.c} (96%) diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am b/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am index 0b04b185..2ec98b80 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am @@ -25,7 +25,7 @@ AM_CFLAGS = $(GLIB_CFLAGS) AM_CFLAGS += $(GTK_CFLAGS) LIBS += $(GLIB_LIBS) -LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/mainlib -lmainWinApi +LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/mainlib -lmainwinapi libdir = ${lttvplugindir} diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c index 2c10cb02..f1fe8788 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c @@ -20,7 +20,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 0f27942b..efc2dea9 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include "eventhooks.h" diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c index 871668dc..67bf7cca 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include "cfv.h" #include "eventhooks.h" diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am b/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am index 1ca8c5bb..b5808cc3 100644 --- a/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am +++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am @@ -26,7 +26,7 @@ AM_CFLAGS = $(GLIB_CFLAGS) AM_CFLAGS += $(GTK_CFLAGS) LIBS += $(GLIB_LIBS) -LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/mainlib -lmainWinApi +LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/mainlib -lmainwinapi libdir = ${lttvplugindir} diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c index 02ad79a0..7c3924f7 100644 --- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c +++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include #include diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/Makefile.am b/ltt/branches/poly/lttv/modules/gui/main/src/Makefile.am index b4608b49..b80e2e80 100644 --- a/ltt/branches/poly/lttv/modules/gui/main/src/Makefile.am +++ b/ltt/branches/poly/lttv/modules/gui/main/src/Makefile.am @@ -3,7 +3,7 @@ AM_CFLAGS = $(GLIB_CFLAGS) AM_CFLAGS += $(GTK_CFLAGS) LIBS += $(GLIB_LIBS) -LIBS += $(GTK_LIBS) -L$(top_srcdir)/lttv/modules/gui/mainlib -lmainWinApi +LIBS += $(GTK_LIBS) -L$(top_srcdir)/lttv/modules/gui/mainlib -lmainwinapi INCLUDES = \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ 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 cd13300b..4e6c01d5 100644 --- a/ltt/branches/poly/lttv/modules/gui/main/src/callbacks.c +++ b/ltt/branches/poly/lttv/modules/gui/main/src/callbacks.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include 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 e93afbd3..b5529955 100644 --- a/ltt/branches/poly/lttv/modules/gui/main/src/gtkmultivpaned.c +++ b/ltt/branches/poly/lttv/modules/gui/main/src/gtkmultivpaned.c @@ -21,7 +21,7 @@ #include //#include "gtkintl.h" #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/mainlib/Makefile.am b/ltt/branches/poly/lttv/modules/gui/mainlib/Makefile.am index e4c77884..b977108c 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainlib/Makefile.am +++ b/ltt/branches/poly/lttv/modules/gui/mainlib/Makefile.am @@ -11,8 +11,8 @@ AM_CFLAGS += $(GTK_CFLAGS) LIBS += $(GLIB_LIBS) LIBS += $(GTK_LIBS) -lib_LTLIBRARIES = libmainWinApi.la -libmainWinApi_la_SOURCES = toolbar.c menu.c gtkTraceSet.c -#libmainWinApi_la_LDFLAGS = -L${top_srcdir}/lttv/modules/gui/API -lcustomBox +lib_LTLIBRARIES = libmainwinapi.la +libmainwinapi_la_SOURCES = toolbar.c menu.c gtktraceset.c +#libmainwinapi_la_LDFLAGS = -L${top_srcdir}/lttv/modules/gui/API -lcustomBox EXTRA_DIST = diff --git a/ltt/branches/poly/lttv/modules/gui/mainlib/gtkTraceSet.c b/ltt/branches/poly/lttv/modules/gui/mainlib/gtktraceset.c similarity index 96% rename from ltt/branches/poly/lttv/modules/gui/mainlib/gtkTraceSet.c rename to ltt/branches/poly/lttv/modules/gui/mainlib/gtktraceset.c index 5a55f8e5..51884a3f 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainlib/gtkTraceSet.c +++ b/ltt/branches/poly/lttv/modules/gui/mainlib/gtktraceset.c @@ -1,4 +1,22 @@ -/*! \file gtkTraceSet.h +/* This file is part of the Linux Trace Toolkit viewer + * Copyright (C) 2003-2004 XangXiu Yang + * + * 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. + */ + +/*! \file gtktraceset.h * \brief API used by the graphical viewers to interact with their top window. * * Main window (gui module) is the place to contain and display viewers. @@ -14,7 +32,7 @@ #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/mainlib/menu.c index 06babb47..bcca5347 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainlib/menu.c +++ b/ltt/branches/poly/lttv/modules/gui/mainlib/menu.c @@ -1,3 +1,21 @@ +/* This file is part of the Linux Trace Toolkit viewer + * Copyright (C) 2003-2004 XangXiu Yang + * + * 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. + */ + #include diff --git a/ltt/branches/poly/lttv/modules/gui/mainlib/toolbar.c b/ltt/branches/poly/lttv/modules/gui/mainlib/toolbar.c index ff16c42d..9b1f2877 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainlib/toolbar.c +++ b/ltt/branches/poly/lttv/modules/gui/mainlib/toolbar.c @@ -1,3 +1,21 @@ +/* This file is part of the Linux Trace Toolkit viewer + * Copyright (C) 2003-2004 XangXiu Yang + * + * 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. + */ + #include diff --git a/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am b/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am index 3f266b9f..602621ba 100644 --- a/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am +++ b/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = $(GLIB_CFLAGS) AM_CFLAGS += $(GTK_CFLAGS) LIBS += $(GLIB_LIBS) -LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/mainlib -lmainWinApi +LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/mainlib -lmainwinapi libdir = ${lttvplugindir} diff --git a/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c b/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c index 7541336d..8c241c64 100644 --- a/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c +++ b/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include -- 2.34.1