apply tim fixes

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

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index f6a1a7904737f4f42bd04ca21262506e64f0cf0b..2e3c730655f9dd25c020914e439886fcaad64431 100644 (file)
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -87,7 +87,7 @@ lttvplugindir="${lttvlibdir}/plugins"
 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) -I\$(top_builddir) -I\$(top_lttvdir) -I\$(top_lttvwindowdir)"
 
 #CPPFLAGS="${GLIB_CFLAGS}"
 #AC_SUBST(CPPFLAGS)

diff --git a/ltt/branches/poly/lttv/lttv/Makefile.am b/ltt/branches/poly/lttv/lttv/Makefile.am
index c72f2013d34d2b025821bcac0a4c867a15501c17..f96f418f4c3b0c34e3d611764ea6caac7cea5560 100644 (file)
--- a/ltt/branches/poly/lttv/lttv/Makefile.am
+++ b/ltt/branches/poly/lttv/lttv/Makefile.am
@@ -1,5 +1,5 @@
 AM_CFLAGS = $(GLIB_CFLAGS) 
-LIBS += $(POPT_LIBS) $(GLIB_LIBS) -lgobject-2.0 -L${top_srcdir}/ltt\
+LIBS += $(POPT_LIBS) $(GLIB_LIBS) -lgobject-2.0 -L${top_builddir}/ltt\
           -llttvtraceread
 
 bin_PROGRAMS = lttv.real
@@ -11,13 +11,13 @@ EXTRA_DIST = lttv.sh lttv-gui.sh
 lttv: lttv.sh
        rm -f lttv
        echo "#!"$(BASH) > lttv
-       cat lttv.sh >> lttv
+       cat $(srcdir)/lttv.sh >> lttv
        chmod ugo+x lttv
 
 lttv-gui: lttv-gui.sh
        rm -f lttv-gui
        echo "#!"$(BASH) > lttv-gui
-       cat lttv-gui.sh >> lttv-gui
+       cat $(srcdir)/lttv-gui.sh >> lttv-gui
        chmod ugo+x lttv-gui
 
 

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am b/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am
index b9510293ab2c54b07e7f75afdb3b3f5d649f2e14..edf21a01442785db739f01b1bbf87f40a8360afe 100644 (file)
--- 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/lttvwindow/lttvwindow -llttvwindow
+LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
 
 libdir = ${lttvplugindir}
 

diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am b/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am
index 9c0819801721b765fdaa39aff1ab1f8002a76ea1..98c70c90f645fdaf62849e383ec870c2907d62c4 100644 (file)
--- 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/lttvwindow/lttvwindow -llttvwindow
+LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
 
 libdir = ${lttvplugindir}
 

diff --git a/ltt/branches/poly/lttv/modules/gui/diskperformance/Makefile.am b/ltt/branches/poly/lttv/modules/gui/diskperformance/Makefile.am
index 3396bc6af8deb365955e1473a1a57f3c036e2dbf..a55f3ca108bb79f65d4394bf8228b7959fb85ada 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/diskperformance/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/diskperformance/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/lttvwindow/lttvwindow -llttvwindow
+LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
 
 libdir = ${lttvplugindir}
 

diff --git a/ltt/branches/poly/lttv/modules/gui/filter/Makefile.am b/ltt/branches/poly/lttv/modules/gui/filter/Makefile.am
index 25fc978c7e031b5d20abd6ae0ef3d8ac496fd355..8649d2249024585459fb235261237251bd3d3fe3 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/filter/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/filter/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/lttvwindow/lttvwindow -llttvwindow
+LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
 
 libdir = ${lttvplugindir}
 

diff --git a/ltt/branches/poly/lttv/modules/gui/histogram/Makefile.am b/ltt/branches/poly/lttv/modules/gui/histogram/Makefile.am
index 70c143de8e2c05a2aae851de01ff6043cd2e79be..894ccda363de60bca6d2600b2e986302feb58c7e 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/histogram/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/histogram/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/lttvwindow/lttvwindow -llttvwindow
+LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
 
 libdir = ${lttvplugindir}
 

diff --git a/ltt/branches/poly/lttv/modules/gui/interrupts/Makefile.am b/ltt/branches/poly/lttv/modules/gui/interrupts/Makefile.am
index 28a357d3401ad10475c58cef77b1901a1ba6596f..a8aac7db2020ee8639ea649a3cf848a3868a371f 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/interrupts/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/interrupts/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/lttvwindow/lttvwindow -llttvwindow
+LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
 
 libdir = ${lttvplugindir}
 

diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/Makefile.am b/ltt/branches/poly/lttv/modules/gui/lttvwindow/Makefile.am
index aa12d78d0c00209a85c7477ea0b77619663f7aa1..828e9607a35cfe9cf03eb47a8f36d00f61723855 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/Makefile.am
@@ -16,7 +16,7 @@ install-data-local:
 dist-hook:
        if test -d pixmaps; then \
          mkdir $(distdir)/pixmaps; \
-         for pixmap in pixmaps/*; do \
+         for pixmap in pixmaps/*.xpm pixmaps/*.png; do \
            if test -f $$pixmap; then \
              cp -p $$pixmap $(distdir)/pixmaps; \
            fi \

diff --git a/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am b/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am
index cf582c23aee66c893ac85a108f559c614e1091d4..40d7b09fb26944dc110b0056f2edb11eccc6dbf7 100644 (file)
--- 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/lttvwindow/lttvwindow -llttvwindow
+LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
 
 libdir = ${lttvplugindir}
 

diff --git a/ltt/branches/poly/lttv/modules/gui/tracecontrol/Makefile.am b/ltt/branches/poly/lttv/modules/gui/tracecontrol/Makefile.am
index 0c04b19581734b11c8968e7127e7357d905d6474..cc7e08eff3168754c2d356c7532efb54a1b50dca 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/tracecontrol/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/tracecontrol/Makefile.am
@@ -8,7 +8,7 @@ AM_CFLAGS = $(GLIB_CFLAGS)
 AM_CFLAGS += $(GTK_CFLAGS)
 AM_CFLAGS += -DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_BIN_DIR=\""$(bindir)"\"
 LIBS += $(GLIB_LIBS)
-LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
+LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
 LIBS += $(UTIL_LIBS)
 
 libdir = ${lttvplugindir}