From d8f124de0295aea546b6debf5945bfeea2bbeb2a Mon Sep 17 00:00:00 2001 From: dagenais Date: Wed, 14 Apr 2004 20:13:25 +0000 Subject: [PATCH] Moving files around to get rid of the shared include tree. Some other cleaning and renaming at the same time. Unfortunately such moves must be done in more than one commit. This is not final yet! git-svn-id: http://ltt.polymtl.ca/svn@501 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt/branches/poly/configure.in | 21 ++++++------ ltt/branches/poly/include/Makefile.am | 1 - ltt/branches/poly/include/lttv/Makefile.am | 21 ------------ ltt/branches/poly/include/lttv/textDump.h | 0 ltt/branches/poly/lttv/lttv/Makefile.am | 32 +++++++++++++++++++ .../poly/lttv/{main => lttv}/attribute.c | 0 .../poly/{include => lttv}/lttv/attribute.h | 0 .../lttv/{modules/text => lttv}/batchtest.c | 2 +- .../poly/lttv/{main => lttv}/filter.c | 0 .../poly/{include => lttv}/lttv/filter.h | 0 ltt/branches/poly/lttv/{main => lttv}/hook.c | 0 .../poly/{include => lttv}/lttv/hook.h | 0 .../poly/lttv/{main => lttv}/iattribute.c | 0 .../poly/{include => lttv}/lttv/iattribute.h | 0 .../poly/{include => lttv}/lttv/lttv.h | 0 ltt/branches/poly/lttv/{main => lttv}/main.c | 0 .../poly/lttv/{main => lttv}/module.c | 0 .../poly/{include => lttv}/lttv/module.h | 0 .../poly/lttv/{main => lttv}/option.c | 0 .../poly/{include => lttv}/lttv/option.h | 0 .../poly/lttv/{main => lttv}/processTrace.c | 2 +- ltt/branches/poly/lttv/{main => lttv}/state.c | 0 .../poly/{include => lttv}/lttv/state.h | 2 +- ltt/branches/poly/lttv/{main => lttv}/stats.c | 0 .../poly/{include => lttv}/lttv/stats.h | 0 .../lttv/tracecontext.h} | 0 .../poly/lttv/{main => lttv}/traceset.c | 0 .../poly/{include => lttv}/lttv/traceset.h | 0 ltt/branches/poly/lttv/main/Makefile.am | 17 ---------- .../lttv/modules/gui/controlflow/drawing.c | 2 +- .../lttv/modules/gui/controlflow/drawitem.c | 2 +- .../lttv/modules/gui/detailedevents/events.c | 2 +- .../lttv/modules/gui/main/src/init_module.c | 2 +- .../poly/lttv/modules/gui/mainlib/Makefile.am | 10 ++++++ .../modules/gui/mainlib}/common.h | 0 .../modules/gui/mainlib}/gtkdirsel.h | 0 .../modules/gui/mainlib}/gtkmultivpaned.h | 0 .../lttv/modules/gui/mainlib/gtktraceset.c | 2 +- .../modules/gui/mainlib}/gtktraceset.h | 0 .../modules/gui/mainlib}/lttvfilter.h | 0 .../modules/gui/mainlib}/mainwindow.h | 2 +- .../lttv => lttv/modules/gui/mainlib}/menu.h | 0 .../modules/gui/mainlib}/toolbar.h | 0 .../lttv/modules/gui/statistics/statistics.c | 2 +- .../poly/lttv/modules/text/Makefile.am | 6 ++-- .../poly/lttv/modules/text/batchAnalysis.c | 2 +- .../modules/text/batchanalysis.h} | 0 47 files changed, 67 insertions(+), 63 deletions(-) delete mode 100644 ltt/branches/poly/include/Makefile.am delete mode 100644 ltt/branches/poly/include/lttv/Makefile.am delete mode 100644 ltt/branches/poly/include/lttv/textDump.h create mode 100644 ltt/branches/poly/lttv/lttv/Makefile.am rename ltt/branches/poly/lttv/{main => lttv}/attribute.c (100%) rename ltt/branches/poly/{include => lttv}/lttv/attribute.h (100%) rename ltt/branches/poly/lttv/{modules/text => lttv}/batchtest.c (99%) rename ltt/branches/poly/lttv/{main => lttv}/filter.c (100%) rename ltt/branches/poly/{include => lttv}/lttv/filter.h (100%) rename ltt/branches/poly/lttv/{main => lttv}/hook.c (100%) rename ltt/branches/poly/{include => lttv}/lttv/hook.h (100%) rename ltt/branches/poly/lttv/{main => lttv}/iattribute.c (100%) rename ltt/branches/poly/{include => lttv}/lttv/iattribute.h (100%) rename ltt/branches/poly/{include => lttv}/lttv/lttv.h (100%) rename ltt/branches/poly/lttv/{main => lttv}/main.c (100%) rename ltt/branches/poly/lttv/{main => lttv}/module.c (100%) rename ltt/branches/poly/{include => lttv}/lttv/module.h (100%) rename ltt/branches/poly/lttv/{main => lttv}/option.c (100%) rename ltt/branches/poly/{include => lttv}/lttv/option.h (100%) rename ltt/branches/poly/lttv/{main => lttv}/processTrace.c (99%) rename ltt/branches/poly/lttv/{main => lttv}/state.c (100%) rename ltt/branches/poly/{include => lttv}/lttv/state.h (99%) rename ltt/branches/poly/lttv/{main => lttv}/stats.c (100%) rename ltt/branches/poly/{include => lttv}/lttv/stats.h (100%) rename ltt/branches/poly/{include/lttv/processTrace.h => lttv/lttv/tracecontext.h} (100%) rename ltt/branches/poly/lttv/{main => lttv}/traceset.c (100%) rename ltt/branches/poly/{include => lttv}/lttv/traceset.h (100%) delete mode 100644 ltt/branches/poly/lttv/main/Makefile.am rename ltt/branches/poly/{include/lttv => lttv/modules/gui/mainlib}/common.h (100%) rename ltt/branches/poly/{include/lttv => lttv/modules/gui/mainlib}/gtkdirsel.h (100%) rename ltt/branches/poly/{include/lttv => lttv/modules/gui/mainlib}/gtkmultivpaned.h (100%) rename ltt/branches/poly/{include/lttv => lttv/modules/gui/mainlib}/gtktraceset.h (100%) rename ltt/branches/poly/{include/lttv => lttv/modules/gui/mainlib}/lttvfilter.h (100%) rename ltt/branches/poly/{include/lttv => lttv/modules/gui/mainlib}/mainwindow.h (99%) rename ltt/branches/poly/{include/lttv => lttv/modules/gui/mainlib}/menu.h (100%) rename ltt/branches/poly/{include/lttv => lttv/modules/gui/mainlib}/toolbar.h (100%) rename ltt/branches/poly/{include/lttv/batchAnalysis.h => lttv/modules/text/batchanalysis.h} (100%) diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in index 193f3414..f245ffd3 100644 --- a/ltt/branches/poly/configure.in +++ b/ltt/branches/poly/configure.in @@ -77,28 +77,31 @@ lttlibdir="${libdir}/ltt" AC_SUBST(lttlibdir) -top_includedir="\$(top_srcdir)/include" -AC_SUBST(top_includedir) +top_guidir="\$(top_srcdir)/lttv/modules/gui" +AC_SUBST(top_guidir) -DEFAULT_INCLUDES="-I\$(top_includedir) -I\$(top_srcdir)" +DEFAULT_INCLUDES="-I\$(top_guidir) -I\$(top_srcdir)" AC_SUBST(DEFAULT_INCLUDES) #CPPFLAGS="${GLIB_CFLAGS}" #AC_SUBST(CPPFLAGS) +lttincludedir="${includedir}/ltt" +AC_SUBST(lttincludedir) + lttvincludedir="${includedir}/lttv" AC_SUBST(lttvincludedir) -lttincludedir="${includedir}/ltt" -AC_SUBST(lttincludedir) +lttvguiincludedir="${includedir}/lttvgui" +AC_SUBST(lttvguiincludedir) AC_CONFIG_FILES([Makefile lttv/Makefile - lttv/main/Makefile + lttv/lttv/Makefile lttv/modules/Makefile lttv/modules/text/Makefile lttv/modules/gui/Makefile - lttv/modules/gui/mainlib/Makefile + lttv/modules/gui/lttvgui/Makefile lttv/modules/gui/main/Makefile lttv/modules/gui/main/src/Makefile lttv/modules/gui/main/pixmaps/Makefile @@ -108,7 +111,5 @@ AC_CONFIG_FILES([Makefile lttv/modules/gui/statistics/Makefile lttd/Makefile ltt/Makefile - include/Makefile - ltt/convert/Makefile - include/lttv/Makefile]) + ltt/convert/Makefile]) AC_OUTPUT diff --git a/ltt/branches/poly/include/Makefile.am b/ltt/branches/poly/include/Makefile.am deleted file mode 100644 index 1a1d52d1..00000000 --- a/ltt/branches/poly/include/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = lttv diff --git a/ltt/branches/poly/include/lttv/Makefile.am b/ltt/branches/poly/include/lttv/Makefile.am deleted file mode 100644 index 2f4c997d..00000000 --- a/ltt/branches/poly/include/lttv/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -lttvinclude_HEADERS = \ - attribute.h\ - batchAnalysis.h\ - common.h\ - filter.h\ - gtktraceset.h\ - gtkmultivpaned.h\ - hook.h\ - iattribute.h\ - lttv.h\ - mainwindow.h\ - menu.h\ - module.h\ - option.h\ - processTrace.h\ - state.h\ - stats.h\ - textDump.h\ - toolbar.h\ - traceset.h\ - lttvfilter.h diff --git a/ltt/branches/poly/include/lttv/textDump.h b/ltt/branches/poly/include/lttv/textDump.h deleted file mode 100644 index e69de29b..00000000 diff --git a/ltt/branches/poly/lttv/lttv/Makefile.am b/ltt/branches/poly/lttv/lttv/Makefile.am new file mode 100644 index 00000000..2023fc93 --- /dev/null +++ b/ltt/branches/poly/lttv/lttv/Makefile.am @@ -0,0 +1,32 @@ +AM_CFLAGS = $(GLIB_CFLAGS) +LIBS += $(GLIB_LIBS) -lgobject-2.0 -L$(top_srcdir)/ltt -ltraceread + +bin_PROGRAMS = lttv + +INCLUDES = \ + -DPACKAGE_PLUGIN_DIR=\""$(lttvplugindir)"\" \ + @PACKAGE_CFLAGS@ \ + $(DEFAULT_INCLUDES) + +libdir = ${lttvplugindir} + +lttvinclude_HEADERS = \ + attribute.h\ + hook.h\ + iattribute.h\ + lttv.h\ + module.h\ + option.h\ + state.h\ + stats.h\ + tracecontext.h\ + traceset.h + +noinst_HEADERS = \ + filter.h + +lttv_SOURCES = batchtest.c main.c module.c option.c \ + hook.c attribute.c \ + iattribute.c state.c stats.c \ + processTrace.c traceset.c + diff --git a/ltt/branches/poly/lttv/main/attribute.c b/ltt/branches/poly/lttv/lttv/attribute.c similarity index 100% rename from ltt/branches/poly/lttv/main/attribute.c rename to ltt/branches/poly/lttv/lttv/attribute.c diff --git a/ltt/branches/poly/include/lttv/attribute.h b/ltt/branches/poly/lttv/lttv/attribute.h similarity index 100% rename from ltt/branches/poly/include/lttv/attribute.h rename to ltt/branches/poly/lttv/lttv/attribute.h diff --git a/ltt/branches/poly/lttv/modules/text/batchtest.c b/ltt/branches/poly/lttv/lttv/batchtest.c similarity index 99% rename from ltt/branches/poly/lttv/modules/text/batchtest.c rename to ltt/branches/poly/lttv/lttv/batchtest.c index e57c4414..2fc7fd99 100644 --- a/ltt/branches/poly/lttv/modules/text/batchtest.c +++ b/ltt/branches/poly/lttv/lttv/batchtest.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/ltt/branches/poly/lttv/main/filter.c b/ltt/branches/poly/lttv/lttv/filter.c similarity index 100% rename from ltt/branches/poly/lttv/main/filter.c rename to ltt/branches/poly/lttv/lttv/filter.c diff --git a/ltt/branches/poly/include/lttv/filter.h b/ltt/branches/poly/lttv/lttv/filter.h similarity index 100% rename from ltt/branches/poly/include/lttv/filter.h rename to ltt/branches/poly/lttv/lttv/filter.h diff --git a/ltt/branches/poly/lttv/main/hook.c b/ltt/branches/poly/lttv/lttv/hook.c similarity index 100% rename from ltt/branches/poly/lttv/main/hook.c rename to ltt/branches/poly/lttv/lttv/hook.c diff --git a/ltt/branches/poly/include/lttv/hook.h b/ltt/branches/poly/lttv/lttv/hook.h similarity index 100% rename from ltt/branches/poly/include/lttv/hook.h rename to ltt/branches/poly/lttv/lttv/hook.h diff --git a/ltt/branches/poly/lttv/main/iattribute.c b/ltt/branches/poly/lttv/lttv/iattribute.c similarity index 100% rename from ltt/branches/poly/lttv/main/iattribute.c rename to ltt/branches/poly/lttv/lttv/iattribute.c diff --git a/ltt/branches/poly/include/lttv/iattribute.h b/ltt/branches/poly/lttv/lttv/iattribute.h similarity index 100% rename from ltt/branches/poly/include/lttv/iattribute.h rename to ltt/branches/poly/lttv/lttv/iattribute.h diff --git a/ltt/branches/poly/include/lttv/lttv.h b/ltt/branches/poly/lttv/lttv/lttv.h similarity index 100% rename from ltt/branches/poly/include/lttv/lttv.h rename to ltt/branches/poly/lttv/lttv/lttv.h diff --git a/ltt/branches/poly/lttv/main/main.c b/ltt/branches/poly/lttv/lttv/main.c similarity index 100% rename from ltt/branches/poly/lttv/main/main.c rename to ltt/branches/poly/lttv/lttv/main.c diff --git a/ltt/branches/poly/lttv/main/module.c b/ltt/branches/poly/lttv/lttv/module.c similarity index 100% rename from ltt/branches/poly/lttv/main/module.c rename to ltt/branches/poly/lttv/lttv/module.c diff --git a/ltt/branches/poly/include/lttv/module.h b/ltt/branches/poly/lttv/lttv/module.h similarity index 100% rename from ltt/branches/poly/include/lttv/module.h rename to ltt/branches/poly/lttv/lttv/module.h diff --git a/ltt/branches/poly/lttv/main/option.c b/ltt/branches/poly/lttv/lttv/option.c similarity index 100% rename from ltt/branches/poly/lttv/main/option.c rename to ltt/branches/poly/lttv/lttv/option.c diff --git a/ltt/branches/poly/include/lttv/option.h b/ltt/branches/poly/lttv/lttv/option.h similarity index 100% rename from ltt/branches/poly/include/lttv/option.h rename to ltt/branches/poly/lttv/lttv/option.h diff --git a/ltt/branches/poly/lttv/main/processTrace.c b/ltt/branches/poly/lttv/lttv/processTrace.c similarity index 99% rename from ltt/branches/poly/lttv/main/processTrace.c rename to ltt/branches/poly/lttv/lttv/processTrace.c index cb50c0a3..30f2da07 100644 --- a/ltt/branches/poly/lttv/main/processTrace.c +++ b/ltt/branches/poly/lttv/lttv/processTrace.c @@ -17,7 +17,7 @@ */ -#include +#include #include #include #include diff --git a/ltt/branches/poly/lttv/main/state.c b/ltt/branches/poly/lttv/lttv/state.c similarity index 100% rename from ltt/branches/poly/lttv/main/state.c rename to ltt/branches/poly/lttv/lttv/state.c diff --git a/ltt/branches/poly/include/lttv/state.h b/ltt/branches/poly/lttv/lttv/state.h similarity index 99% rename from ltt/branches/poly/include/lttv/state.h rename to ltt/branches/poly/lttv/lttv/state.h index 85b90498..7529dc65 100644 --- a/ltt/branches/poly/include/lttv/state.h +++ b/ltt/branches/poly/lttv/lttv/state.h @@ -20,7 +20,7 @@ #define STATE_H #include -#include +#include #include /* The operating system state, kept during the trace analysis, diff --git a/ltt/branches/poly/lttv/main/stats.c b/ltt/branches/poly/lttv/lttv/stats.c similarity index 100% rename from ltt/branches/poly/lttv/main/stats.c rename to ltt/branches/poly/lttv/lttv/stats.c diff --git a/ltt/branches/poly/include/lttv/stats.h b/ltt/branches/poly/lttv/lttv/stats.h similarity index 100% rename from ltt/branches/poly/include/lttv/stats.h rename to ltt/branches/poly/lttv/lttv/stats.h diff --git a/ltt/branches/poly/include/lttv/processTrace.h b/ltt/branches/poly/lttv/lttv/tracecontext.h similarity index 100% rename from ltt/branches/poly/include/lttv/processTrace.h rename to ltt/branches/poly/lttv/lttv/tracecontext.h diff --git a/ltt/branches/poly/lttv/main/traceset.c b/ltt/branches/poly/lttv/lttv/traceset.c similarity index 100% rename from ltt/branches/poly/lttv/main/traceset.c rename to ltt/branches/poly/lttv/lttv/traceset.c diff --git a/ltt/branches/poly/include/lttv/traceset.h b/ltt/branches/poly/lttv/lttv/traceset.h similarity index 100% rename from ltt/branches/poly/include/lttv/traceset.h rename to ltt/branches/poly/lttv/lttv/traceset.h diff --git a/ltt/branches/poly/lttv/main/Makefile.am b/ltt/branches/poly/lttv/main/Makefile.am deleted file mode 100644 index 4c891fc3..00000000 --- a/ltt/branches/poly/lttv/main/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -AM_CFLAGS = $(GLIB_CFLAGS) -LIBS += $(GLIB_LIBS) -lgobject-2.0 -L$(top_srcdir)/ltt -ltraceread - -bin_PROGRAMS = lttv - -INCLUDES = \ - -DPACKAGE_PLUGIN_DIR=\""$(lttvplugindir)"\" \ - @PACKAGE_CFLAGS@ \ - $(DEFAULT_INCLUDES) - -libdir = ${lttvplugindir} - -lttv_SOURCES = main.c module.c option.c \ - hook.c attribute.c \ - iattribute.c processTrace.c \ - state.c stats.c traceset.c - diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c index e2138cdb..7f4ee2f4 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 diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c index 6d535fa5..9445141e 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c @@ -102,7 +102,7 @@ #include #include -#include +#include #include #include "drawitem.h" diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c index 43b81d03..51d51aa1 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 #include 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 781844ad..c1fcf1fc 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 @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/ltt/branches/poly/lttv/modules/gui/mainlib/Makefile.am b/ltt/branches/poly/lttv/modules/gui/mainlib/Makefile.am index b977108c..4562409b 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainlib/Makefile.am +++ b/ltt/branches/poly/lttv/modules/gui/mainlib/Makefile.am @@ -15,4 +15,14 @@ lib_LTLIBRARIES = libmainwinapi.la libmainwinapi_la_SOURCES = toolbar.c menu.c gtktraceset.c #libmainwinapi_la_LDFLAGS = -L${top_srcdir}/lttv/modules/gui/API -lcustomBox +lttvguiinclude_HEADERS = \ + common.h\ + gtkdirsel.h\ + gtkmultivpaned.h\ + gtktraceset.h\ + lttvfilter.h\ + mainwindow.h\ + menu.h\ + toolbar.h + EXTRA_DIST = diff --git a/ltt/branches/poly/include/lttv/common.h b/ltt/branches/poly/lttv/modules/gui/mainlib/common.h similarity index 100% rename from ltt/branches/poly/include/lttv/common.h rename to ltt/branches/poly/lttv/modules/gui/mainlib/common.h diff --git a/ltt/branches/poly/include/lttv/gtkdirsel.h b/ltt/branches/poly/lttv/modules/gui/mainlib/gtkdirsel.h similarity index 100% rename from ltt/branches/poly/include/lttv/gtkdirsel.h rename to ltt/branches/poly/lttv/modules/gui/mainlib/gtkdirsel.h diff --git a/ltt/branches/poly/include/lttv/gtkmultivpaned.h b/ltt/branches/poly/lttv/modules/gui/mainlib/gtkmultivpaned.h similarity index 100% rename from ltt/branches/poly/include/lttv/gtkmultivpaned.h rename to ltt/branches/poly/lttv/modules/gui/mainlib/gtkmultivpaned.h diff --git a/ltt/branches/poly/lttv/modules/gui/mainlib/gtktraceset.c b/ltt/branches/poly/lttv/modules/gui/mainlib/gtktraceset.c index 51884a3f..772583f9 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainlib/gtktraceset.c +++ b/ltt/branches/poly/lttv/modules/gui/mainlib/gtktraceset.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/ltt/branches/poly/include/lttv/gtktraceset.h b/ltt/branches/poly/lttv/modules/gui/mainlib/gtktraceset.h similarity index 100% rename from ltt/branches/poly/include/lttv/gtktraceset.h rename to ltt/branches/poly/lttv/modules/gui/mainlib/gtktraceset.h diff --git a/ltt/branches/poly/include/lttv/lttvfilter.h b/ltt/branches/poly/lttv/modules/gui/mainlib/lttvfilter.h similarity index 100% rename from ltt/branches/poly/include/lttv/lttvfilter.h rename to ltt/branches/poly/lttv/modules/gui/mainlib/lttvfilter.h diff --git a/ltt/branches/poly/include/lttv/mainwindow.h b/ltt/branches/poly/lttv/modules/gui/mainlib/mainwindow.h similarity index 99% rename from ltt/branches/poly/include/lttv/mainwindow.h rename to ltt/branches/poly/lttv/modules/gui/mainlib/mainwindow.h index ffdeefe5..8ef8defb 100644 --- a/ltt/branches/poly/include/lttv/mainwindow.h +++ b/ltt/branches/poly/lttv/modules/gui/mainlib/mainwindow.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/ltt/branches/poly/include/lttv/menu.h b/ltt/branches/poly/lttv/modules/gui/mainlib/menu.h similarity index 100% rename from ltt/branches/poly/include/lttv/menu.h rename to ltt/branches/poly/lttv/modules/gui/mainlib/menu.h diff --git a/ltt/branches/poly/include/lttv/toolbar.h b/ltt/branches/poly/lttv/modules/gui/mainlib/toolbar.h similarity index 100% rename from ltt/branches/poly/include/lttv/toolbar.h rename to ltt/branches/poly/lttv/modules/gui/mainlib/toolbar.h diff --git a/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c b/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c index 9dbd162c..92cee3cc 100644 --- a/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c +++ b/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/ltt/branches/poly/lttv/modules/text/Makefile.am b/ltt/branches/poly/lttv/modules/text/Makefile.am index a682e35f..88f9235f 100644 --- a/ltt/branches/poly/lttv/modules/text/Makefile.am +++ b/ltt/branches/poly/lttv/modules/text/Makefile.am @@ -5,11 +5,11 @@ LIBS += $(GLIB_LIBS) -lgobject-2.0 -L$(top_srcdir)/ltt -ltraceread libdir = ${lttvplugindir} -lib_LTLIBRARIES = libtextDump.la libbatchAnalysis.la libbatchtest.la +lib_LTLIBRARIES = libtextDump.la libbatchAnalysis.la libtextDump_la_LDFLAGS = -module libtextDump_la_SOURCES = textDump.c libbatchAnalysis_la_LDFLAGS = -module libbatchAnalysis_la_SOURCES = batchAnalysis.c -libbatchtest_la_LDFLAGS = -module -libbatchtest_la_SOURCES = batchtest.c +noinst_HEADERS = \ + batchanalysis.h diff --git a/ltt/branches/poly/lttv/modules/text/batchAnalysis.c b/ltt/branches/poly/lttv/modules/text/batchAnalysis.c index 0d8f1522..1c69df33 100644 --- a/ltt/branches/poly/lttv/modules/text/batchAnalysis.c +++ b/ltt/branches/poly/lttv/modules/text/batchAnalysis.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/ltt/branches/poly/include/lttv/batchAnalysis.h b/ltt/branches/poly/lttv/modules/text/batchanalysis.h similarity index 100% rename from ltt/branches/poly/include/lttv/batchAnalysis.h rename to ltt/branches/poly/lttv/modules/text/batchanalysis.h -- 2.34.1