From dbedfa64fad539c97696cb420432b516809c49fd Mon Sep 17 00:00:00 2001 From: compudj Date: Wed, 6 Aug 2003 16:32:08 +0000 Subject: [PATCH] Changed automake files to reflect the new header files. Changed lttv and ltt automake to have the bin program dependant on the system headers, which are in $(DEFAULT_INCLUDES)/ltt[v]/header.h git-svn-id: http://ltt.polymtl.ca/svn@170 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt/branches/poly/configure.in | 2 +- ltt/branches/poly/include/ltt/Makefile.am | 3 ++- ltt/branches/poly/include/lttv/Makefile.am | 3 ++- ltt/branches/poly/ltt/Makefile.am | 5 ++++- ltt/branches/poly/lttv/Makefile.am | 14 +++++++++++--- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in index 860c2940..9435ae8e 100644 --- a/ltt/branches/poly/configure.in +++ b/ltt/branches/poly/configure.in @@ -4,7 +4,7 @@ AC_PREREQ(2.57) AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS) #AC_WITH_LTDL # not needed ? -AM_INIT_AUTOMAKE(LinuxTraceToolkit,0.9.7-29052003) +AM_INIT_AUTOMAKE(LinuxTraceToolkit,0.9.7-06082003) AM_CONFIG_HEADER([config.h]) AM_PROG_LIBTOOL diff --git a/ltt/branches/poly/include/ltt/Makefile.am b/ltt/branches/poly/include/ltt/Makefile.am index 98cfe0c6..bb998e7d 100644 --- a/ltt/branches/poly/include/ltt/Makefile.am +++ b/ltt/branches/poly/include/ltt/Makefile.am @@ -1 +1,2 @@ -lttinclude_HEADERS = event.h facility.h ltt-private.h ltt.h tracefile.h type.h +lttinclude_HEADERS = event.h facility.h ltt-private.h ltt.h trace.h \ + type.h LTTTypes.h diff --git a/ltt/branches/poly/include/lttv/Makefile.am b/ltt/branches/poly/include/lttv/Makefile.am index f5efe2c1..00a1df05 100644 --- a/ltt/branches/poly/include/lttv/Makefile.am +++ b/ltt/branches/poly/include/lttv/Makefile.am @@ -1,2 +1,3 @@ lttvinclude_HEADERS = hook.h module.h option.h lttv.h iattribute.h \ - attribute.h processTrace.h state.h traceset.h traceWindow.h + attribute.h processTrace.h state.h traceset.h \ + batchAnalysis.h filter.h gtkTraceSet.h stats.h textDump.h diff --git a/ltt/branches/poly/ltt/Makefile.am b/ltt/branches/poly/ltt/Makefile.am index cc4d018a..995d3e00 100644 --- a/ltt/branches/poly/ltt/Makefile.am +++ b/ltt/branches/poly/ltt/Makefile.am @@ -13,5 +13,8 @@ LIBS += $(GLIB_LIBS) lib_LTLIBRARIES = libtraceread.la libtraceread_la_SOURCES = event.c facility.c parser.c tracefile.c type.c \ - parser.h LTTTypes.h + parser.h + +libtraceread_la_DEPENDENCIES = $(DEFAULT_INCLUDES)/ltt/LTTTypes.h + EXTRA_DIST = crc32.tab diff --git a/ltt/branches/poly/lttv/Makefile.am b/ltt/branches/poly/lttv/Makefile.am index 3a50276f..5d5f44bc 100644 --- a/ltt/branches/poly/lttv/Makefile.am +++ b/ltt/branches/poly/lttv/Makefile.am @@ -9,10 +9,18 @@ bin_PROGRAMS = lttv # -I$(top_srcdir)/include #INCLUDES=$(top_srcdir)/include -tracevisualizer_SOURCES = main.c module.c option.c hook.c attribute.c \ +lttv_SOURCES = main.c module.c option.c hook.c attribute.c \ iattribute.c processTrace.c state.c traceset.c -# lttv.h module.h option.h hook.h attribute.h \ -# iattribute.h processTrace.h state.h traceset.h +lttv_DEPENDENCIES = $(DEFAULT_INCLUDES)/lttv/lttv.h \ + $(DEFAULT_INCLUDES)/lttv/module.h \ + $(DEFAULT_INCLUDES)/lttv/option.h \ + $(DEFAULT_INCLUDES)/lttv/hook.h \ + $(DEFAULT_INCLUDES)/lttv/attribute.h \ + $(DEFAULT_INCLUDES)/lttv/iattribute.h \ + $(DEFAULT_INCLUDES)/lttv/processTrace.h \ + $(DEFAULT_INCLUDES)/lttv/state.h \ + $(DEFAULT_INCLUDES)/lttv/traceset.h + libdir = ${lttvplugindir} -- 2.34.1