From 2864f4c5ccd6f4d5401b40a05b4f4d816617a557 Mon Sep 17 00:00:00 2001 From: dagenais Date: Mon, 19 Apr 2004 17:34:21 +0000 Subject: [PATCH] It compiles and runs after the cleanups git-svn-id: http://ltt.polymtl.ca/svn@504 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt/branches/poly/configure.in | 8 ++++---- ltt/branches/poly/lttv/lttv/Makefile.am | 2 +- ltt/branches/poly/lttv/modules/gui/lttvgui/Makefile.am | 8 +++++++- .../modules/gui/{lttvwindow/src => lttvgui}/gtkdirsel.c | 0 .../gui/{lttvwindow/src => lttvgui}/gtkmultivpaned.c | 0 .../poly/lttv/modules/gui/lttvwindow/src/Makefile.am | 2 -- 6 files changed, 12 insertions(+), 8 deletions(-) rename ltt/branches/poly/lttv/modules/gui/{lttvwindow/src => lttvgui}/gtkdirsel.c (100%) rename ltt/branches/poly/lttv/modules/gui/{lttvwindow/src => lttvgui}/gtkmultivpaned.c (100%) diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in index 638a52b7..a166264a 100644 --- a/ltt/branches/poly/configure.in +++ b/ltt/branches/poly/configure.in @@ -105,10 +105,10 @@ AC_CONFIG_FILES([Makefile lttv/modules/text/Makefile lttv/modules/gui/Makefile lttv/modules/gui/lttvgui/Makefile - lttv/modules/gui/main/Makefile - lttv/modules/gui/main/src/Makefile - lttv/modules/gui/main/pixmaps/Makefile - lttv/modules/gui/icons/Makefile + lttv/modules/gui/lttvwindow/Makefile + lttv/modules/gui/lttvwindow/src/Makefile + lttv/modules/gui/lttvwindow/pixmaps/Makefile + lttv/modules/gui/lttvwindow/glade/Makefile lttv/modules/gui/controlflow/Makefile lttv/modules/gui/detailedevents/Makefile lttv/modules/gui/statistics/Makefile diff --git a/ltt/branches/poly/lttv/lttv/Makefile.am b/ltt/branches/poly/lttv/lttv/Makefile.am index 2023fc93..76b91a22 100644 --- a/ltt/branches/poly/lttv/lttv/Makefile.am +++ b/ltt/branches/poly/lttv/lttv/Makefile.am @@ -28,5 +28,5 @@ noinst_HEADERS = \ lttv_SOURCES = batchtest.c main.c module.c option.c \ hook.c attribute.c \ iattribute.c state.c stats.c \ - processTrace.c traceset.c + tracecontext.c traceset.c diff --git a/ltt/branches/poly/lttv/modules/gui/lttvgui/Makefile.am b/ltt/branches/poly/lttv/modules/gui/lttvgui/Makefile.am index 9f283e5f..a428cfc7 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvgui/Makefile.am +++ b/ltt/branches/poly/lttv/modules/gui/lttvgui/Makefile.am @@ -12,7 +12,13 @@ LIBS += $(GLIB_LIBS) LIBS += $(GTK_LIBS) lib_LTLIBRARIES = liblttvgui.la -liblttvgui_la_SOURCES = toolbar.c menu.c gtktraceset.c +liblttvgui_la_SOURCES =\ + toolbar.c\ + menu.c\ + gtkdirsel.c\ + gtkmultivpaned.c\ + gtktraceset.c + #liblttvgui_la_LDFLAGS = -L${top_srcdir}/lttv/modules/gui/lttvgui -lcustomBox lttvguiinclude_HEADERS = \ diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkdirsel.c b/ltt/branches/poly/lttv/modules/gui/lttvgui/gtkdirsel.c similarity index 100% rename from ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkdirsel.c rename to ltt/branches/poly/lttv/modules/gui/lttvgui/gtkdirsel.c diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkmultivpaned.c b/ltt/branches/poly/lttv/modules/gui/lttvgui/gtkmultivpaned.c similarity index 100% rename from ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkmultivpaned.c rename to ltt/branches/poly/lttv/modules/gui/lttvgui/gtkmultivpaned.c diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/Makefile.am b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/Makefile.am index 41874356..35d1cb50 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/Makefile.am +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/Makefile.am @@ -23,8 +23,6 @@ liblttvwindow_la_SOURCES = \ support.c \ interface.c \ callbacks.c \ - gtkmultivpaned.c \ - gtkdirsel.c \ lttvfilter.c noinst_HEADERS = \ -- 2.34.1