From f0d243f7b3a3fd1f5fe74f9f272213192dc9cdaa Mon Sep 17 00:00:00 2001 From: compudj Date: Wed, 21 Jun 2006 19:47:25 +0000 Subject: [PATCH] apply tim fixes git-svn-id: http://ltt.polymtl.ca/svn@1950 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt/branches/poly/configure.in | 2 +- ltt/branches/poly/lttv/lttv/Makefile.am | 6 +++--- ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am | 2 +- .../poly/lttv/modules/gui/detailedevents/Makefile.am | 2 +- .../poly/lttv/modules/gui/diskperformance/Makefile.am | 2 +- ltt/branches/poly/lttv/modules/gui/filter/Makefile.am | 2 +- ltt/branches/poly/lttv/modules/gui/histogram/Makefile.am | 2 +- ltt/branches/poly/lttv/modules/gui/interrupts/Makefile.am | 2 +- ltt/branches/poly/lttv/modules/gui/lttvwindow/Makefile.am | 2 +- ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am | 2 +- ltt/branches/poly/lttv/modules/gui/tracecontrol/Makefile.am | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in index f6a1a790..2e3c7306 100644 --- 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 c72f2013..f96f418f 100644 --- 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 b9510293..edf21a01 100644 --- 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 9c081980..98c70c90 100644 --- 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 3396bc6a..a55f3ca1 100644 --- 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 25fc978c..8649d224 100644 --- 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 70c143de..894ccda3 100644 --- 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 28a357d3..a8aac7db 100644 --- 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 aa12d78d..828e9607 100644 --- 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 cf582c23..40d7b09f 100644 --- 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 0c04b195..cc7e08ef 100644 --- 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} -- 2.34.1