update build

git-svn-id: http://ltt.polymtl.ca/svn@1686 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/ltt-control/Makefile.am b/ltt-control/Makefile.am
index 66afa9064b224a3c185e9a8a06c7f8b4e7178eb1..c99aabd7f9cbbb337b1a5fa8483acb0f889748e1 100644 (file)
--- a/ltt-control/Makefile.am
+++ b/ltt-control/Makefile.am
@@ -1,6 +1,2 @@
-# WARNING : ltt must come before lttv, so that the traceread library is
-# up to date
+SUBDIRS = liblttctl ltt lttctl lttd facilities
 
-SUBDIRS = liblttctl ltt lttctl lttv lttd doc facilities
-
-EXTRA_DIST = QUICKSTART

diff --git a/ltt-control/README b/ltt-control/README
index 836472ade67c2875f2e634e139e13491b37719bc..acaeba6116d3d266aaec7844a3e069d4909b534b 100644 (file)
--- a/ltt-control/README
+++ b/ltt-control/README
@@ -1,25 +1,14 @@
 
-This package contains the trace reading library and trace viewing tools for
-the new Linux Trace Toolkit trace format. It also contains the lttd, lttctl and
-liblttctl programs which are necessary to obtain a trace.
+This package contains the lttd, lttctl and liblttctl programs which are
+necessary to obtain a trace. It also contains the facilities directory, where
+sits the trace metainformation.
 
 * Compiling
 
 gcc 3.2 or better
-gtk 2.4 or better development libraries
-  (Debian : libgtk2.0, libgtk2.0-dev)
-  (Fedora : gtk2, gtk2-devel)
-  note : For Fedora users : this might require at least core 3 from Fedora,
-  or you might have to compile your own GTK2 library.
 glib 2.4 or better development libraries
   (Debian : libglib2.0-0, libglib2.0-dev)
   (Fedora : glib2, glib2-devel)
-libpopt development libraries
-  (Debian : libpopt0, libpopt-dev)
-  (Fedora : popt)
-libpango development libraries
-  (Debian : libpango1.0, libpango1.0-dev)
-  (Fedora : pango, pango-devel)
 libc6 development librairies 
   (Debian : libc6, libc6-dev)
   (Fedora : glibc, glibc)
@@ -37,7 +26,7 @@ use make, make install.
 
 * Quick Start
 
-See QUICKSTART
+See the LTTV package QUICKSTART
 
 * Source Tree Structure
 
@@ -45,16 +34,9 @@ Here is the tree structure of the Linux Trace Toolkit Viewer package.
 
 ltt: new trace format reading library.
 README: This file.
-debian: debian config files (currently empty).
-doc:    Documentation.
-doc/user:      User related documentation.
-doc/developer: Developer related documentation.
 liblttctl:    Library to communicate with the kernel tracer control module.
 lttctl:       Command line program to use the liblttctl library.
 lttd:   Linux Trace Toolkit daemon.
-lttv:   Linux Trace Toolkit trace analysis tool and viewer.
-lttv/modules:  Linux Trace Toolkit analysis tool and viewer plugin modules.
-specs:  RPM config files (currently empty).
 
 
 * For Developers

diff --git a/ltt-control/configure.in b/ltt-control/configure.in
index b9b8c831ebb5568cdb184941a6e57a2f131a88ee..9250b20c0eafea3b01ec4d2d51f4a1c56d42c49e 100644 (file)
--- a/ltt-control/configure.in
+++ b/ltt-control/configure.in
@@ -23,14 +23,10 @@
 AC_PREREQ(2.57)
 AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
 #AC_WITH_LTDL  # not needed ?
-AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.8.31-11032006)
+AM_INIT_AUTOMAKE(ltt-control,0.1-11032006)
 AM_CONFIG_HEADER(config.h)
 AM_PROG_LIBTOOL
 
-AM_PATH_GLIB_2_0(2.4.0, ,AC_MSG_ERROR([glib is required in order to compile LinuxTraceToolkit - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
-
-AM_PATH_GTK_2_0(2.4.0, ,AC_MSG_ERROR([gtk is required in order to compile GUI - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
-
 AC_PATH_PROGS(BASH, bash)
 
 AC_SYS_LARGEFILE
@@ -38,10 +34,6 @@ AC_SYS_LARGEFILE
 # Checks for programs.
 AC_PROG_CC
 
-# Checks for libraries.
-AC_CHECK_LIB([popt], [poptGetNextOpt], POPT_LIBS="-lpopt",AC_MSG_ERROR([libpopt is required in order to compile LinuxTraceToolkit])  )
-#AC_CHECK_LIB([m], [round], M_LIBS="-lm",AC_MSG_ERROR([Mathematical libraries are missing.])  )
-
 AC_CHECK_LIB([util], [forkpty], UTIL_LIBS="-lutil", AC_MSG_ERROR([libutil is
 required in order to compile LinuxTraceToolkit]))
 
@@ -58,8 +50,6 @@ AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 
-pkg_modules="gtk+-2.0 >= 2.0.0"
-PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 PACKAGE_CFLAGS="-Wall -Wformat"
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
@@ -80,65 +70,18 @@ AC_CHECK_FUNCS([select])
 
 #CPPFLAGS="$CPPFLAGS -I"
 
-AM_CONDITIONAL(LTTVSTATIC, test "$enable_lttvstatic" = yes)
-lttvlibdir="${libdir}/lttv"
-lttvplugindir="${lttvlibdir}/plugins"
-#lttlibdir="${libdir}/ltt"
-top_lttvdir="\$(top_srcdir)/lttv"
-top_lttvwindowdir="\$(top_srcdir)/lttv/modules/gui/lttvwindow"
-
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_lttvdir) -I\$(top_lttvwindowdir)"
+DEFAULT_INCLUDES="-I\$(top_srcdir)"
 
 #CPPFLAGS="${GLIB_CFLAGS}"
 #AC_SUBST(CPPFLAGS)
 
-lttincludedir="${includedir}/ltt"
-lttvincludedir="${includedir}/lttv"
-lttvwindowincludedir="${includedir}/lttvwindow"
-lttctlincludedir="${includedir}/liblttctl"
-
-AC_SUBST(POPT_LIBS)
 AC_SUBST(UTIL_LIBS)
 AC_SUBST(THREAD_LIBS)
-AC_SUBST(lttvlibdir)
-AC_SUBST(lttvplugindir)
-#AC_SUBST(lttlibdir)
-AC_SUBST(top_lttvdir)
-AC_SUBST(top_lttvwindowdir)
 AC_SUBST(DEFAULT_INCLUDES)
-AC_SUBST(lttincludedir)
-AC_SUBST(lttvincludedir)
-AC_SUBST(lttvwindowincludedir)
-AC_SUBST(lttctlincludedir)
 
 AC_CONFIG_FILES([Makefile
      liblttctl/Makefile
      lttctl/Makefile
-                lttv/Makefile
-                lttv/lttv/Makefile
-                lttv/modules/Makefile
-                lttv/modules/text/Makefile
-                lttv/modules/gui/Makefile
-                lttv/modules/gui/lttvwindow/Makefile
-                lttv/modules/gui/interrupts/Makefile
-                lttv/modules/gui/diskperformance/Makefile
-                lttv/modules/gui/lttvwindow/lttvwindow/Makefile
-                lttv/modules/gui/lttvwindow/pixmaps/Makefile
-                lttv/modules/gui/controlflow/Makefile
-                lttv/modules/gui/detailedevents/Makefile
-                lttv/modules/gui/statistics/Makefile
-     lttv/modules/gui/filter/Makefile
-     lttv/modules/gui/tracecontrol/Makefile
                 lttd/Makefile
-                ltt/Makefile
-     doc/Makefile
-     doc/developer/Makefile
-     doc/developer/developer_guide/Makefile
-     doc/developer/developer_guide/docbook/Makefile
-     doc/developer/developer_guide/html/Makefile
-     doc/user/Makefile
-     doc/user/user_guide/Makefile
-     doc/user/user_guide/docbook/Makefile
-     doc/user/user_guide/html/Makefile
      facilities/Makefile])
 AC_OUTPUT