From a100e2b757ba2b4ae34a1b595fdcde1804e07a75 Mon Sep 17 00:00:00 2001 From: compudj Date: Tue, 30 Sep 2003 11:28:05 +0000 Subject: [PATCH] makefile.am + header changes git-svn-id: http://ltt.polymtl.ca/svn@281 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt/branches/poly/configure.in | 4 +++- ltt/branches/poly/ltt/Makefile.am | 7 +++--- ltt/branches/poly/ltt/convert/Makefile.am | 5 ++++ ltt/branches/poly/lttv/Makefile.am | 11 --------- ltt/branches/poly/lttv/modules/Makefile.am | 2 ++ ltt/branches/poly/lttv/modules/compile.txt | 12 ---------- .../modules/gui/mainWin/pixmaps/Makefile.am | 24 +++++++++++++++++++ .../lttv/modules/gui/mainWin/src/Makefile.am | 15 ++++++++---- .../lttv/modules/guiControlFlow/Makefile.am | 3 +++ .../poly/lttv/modules/icons/Makefile.am | 9 +++++++ 10 files changed, 60 insertions(+), 32 deletions(-) delete mode 100644 ltt/branches/poly/lttv/modules/compile.txt create mode 100644 ltt/branches/poly/lttv/modules/gui/mainWin/pixmaps/Makefile.am create mode 100644 ltt/branches/poly/lttv/modules/icons/Makefile.am diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in index 787eeb4f..96823e9b 100644 --- a/ltt/branches/poly/configure.in +++ b/ltt/branches/poly/configure.in @@ -74,13 +74,15 @@ lttincludedir="${includedir}/ltt" AC_SUBST(lttincludedir) AC_CONFIG_FILES([Makefile - lttv/Makefile + lttv/Makefile lttv/modules/Makefile lttv/modules/gui/Makefile lttv/modules/gui/mainWin/Makefile lttv/modules/gui/mainWin/src/Makefile + lttv/modules/gui/mainWin/pixmaps/Makefile lttv/modules/gui/API/Makefile lttv/modules/guiControlFlow/Makefile + lttv/modules/icons/Makefile lttd/Makefile ltt/Makefile include/Makefile diff --git a/ltt/branches/poly/ltt/Makefile.am b/ltt/branches/poly/ltt/Makefile.am index 8af7e869..9def400a 100644 --- a/ltt/branches/poly/ltt/Makefile.am +++ b/ltt/branches/poly/ltt/Makefile.am @@ -12,9 +12,8 @@ AM_CFLAGS = $(GLIB_CFLAGS) LIBS += $(GLIB_LIBS) lib_LTLIBRARIES = libtraceread.la -libtraceread_la_SOURCES = event.c facility.c parser.c tracefile.c type.c \ - parser.h +libtraceread_la_SOURCES = event.c facility.c parser.c tracefile.c type.c +libtraceread_la_HEADERS = parser.h + -libtraceread_la_DEPENDENCIES = ${top_includedir}/ltt/LTTTypes.h - EXTRA_DIST = crc32.tab diff --git a/ltt/branches/poly/ltt/convert/Makefile.am b/ltt/branches/poly/ltt/convert/Makefile.am index fe033010..7748ea92 100644 --- a/ltt/branches/poly/ltt/convert/Makefile.am +++ b/ltt/branches/poly/ltt/convert/Makefile.am @@ -3,3 +3,8 @@ LIBS += $(GLIB_LIBS) bin_PROGRAMS = convert +convert_SOURCES = convert.c + +convert_HEADERS = LTTTypes.h LinuxEvents.h + +EXTRA_DIST = core.xml sysInfo diff --git a/ltt/branches/poly/lttv/Makefile.am b/ltt/branches/poly/lttv/Makefile.am index 83648761..cdaeeaeb 100644 --- a/ltt/branches/poly/lttv/Makefile.am +++ b/ltt/branches/poly/lttv/Makefile.am @@ -11,17 +11,6 @@ bin_PROGRAMS = lttv lttv_SOURCES = main.c module.c option.c hook.c attribute.c \ iattribute.c processTrace.c state.c traceset.c -lttv_DEPENDENCIES = $(top_includedir)/lttv/lttv.h \ - $(top_includedir)/lttv/module.h \ - $(top_includedir)/lttv/option.h \ - $(top_includedir)/lttv/hook.h \ - $(top_includedir)/lttv/attribute.h \ - $(top_includedir)/lttv/iattribute.h \ - $(top_includedir)/lttv/processTrace.h \ - $(top_includedir)/lttv/state.h \ - $(top_includedir)/lttv/traceset.h - - libdir = ${lttvplugindir} lib_LTLIBRARIES = libtextDump.la libbatchAnalysis.la diff --git a/ltt/branches/poly/lttv/modules/Makefile.am b/ltt/branches/poly/lttv/modules/Makefile.am index 1ebbe961..4c29c73a 100644 --- a/ltt/branches/poly/lttv/modules/Makefile.am +++ b/ltt/branches/poly/lttv/modules/Makefile.am @@ -17,3 +17,5 @@ libdir = ${lttvplugindir} lib_LTLIBRARIES = libguiEvents.la libguiEvents_la_LDFLAGS = -module libguiEvents_la_SOURCES = guiEvents.c +libguiEvents_la_HEADERS = gtkrbtree.h gtktreeprivate.h + diff --git a/ltt/branches/poly/lttv/modules/compile.txt b/ltt/branches/poly/lttv/modules/compile.txt deleted file mode 100644 index de6dcb73..00000000 --- a/ltt/branches/poly/lttv/modules/compile.txt +++ /dev/null @@ -1,12 +0,0 @@ -gcc -g -DHAVE_CONFIG_H -I ../../include -I/usr/include/glib-2.0 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -g -O2 -o guiEvents guiEvents.c - - - -gcc -g -DHAVE_CONFIG_H -I ../../include -I/usr/include/glib-2.0 --I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 --I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/X11R6/include --I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wl,--export-dynamic --lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 --lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -g -O2 -o -guiControlFlow guiControlFlow.c - diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/pixmaps/Makefile.am b/ltt/branches/poly/lttv/modules/gui/mainWin/pixmaps/Makefile.am new file mode 100644 index 00000000..fbaef594 --- /dev/null +++ b/ltt/branches/poly/lttv/modules/gui/mainWin/pixmaps/Makefile.am @@ -0,0 +1,24 @@ +# +# Makefile for LTT New generation user interface +# +# Created by Mathieu Desnoyers on September 30, 2003 +# + +EXTRA_DIST = \ + 1downarrow.png\ + 1uparrow.png\ + edit_add_22.png\ + edit_remove_22.png\ + filenew.png\ + fileopen.png\ + filesave.png\ + filesaveas.png\ + gtk-add.png\ + gtk-jump-to.png\ + mini-display.xpm\ + move_message.xpm\ + remove.png\ + remove1.png\ + stock_zoom_fit_24.png\ + stock_zoom_in_24.png\ + stock_zoom_out_24.png diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/Makefile.am b/ltt/branches/poly/lttv/modules/gui/mainWin/src/Makefile.am index 7880689d..d90dc096 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/Makefile.am +++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/Makefile.am @@ -16,13 +16,20 @@ libdir = ${lttvplugindir} #bin_PROGRAMS = mainwin lib_LTLIBRARIES = libmainwin.la + libmainwin_la_LDFLAGS = -module libmainwin_la_SOURCES = \ init_module.c \ - support.c support.h \ - interface.c interface.h \ - callbacks.c callbacks.h \ - gtkcustom.c gtkcustom.h + support.c \ + interface.c \ + callbacks.c \ + gtkcustom.c + +libmainwin_la_HEADERS = \ + support.h \ + interface.h \ + callbacks.h + libmainwin_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS) diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Makefile.am b/ltt/branches/poly/lttv/modules/guiControlFlow/Makefile.am index 2cde21b9..0abcb967 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/Makefile.am +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Makefile.am @@ -15,3 +15,6 @@ lib_LTLIBRARIES = libguiControlFlow.la libguiControlFlow_la_LDFLAGS = -module libguiControlFlow_la_SOURCES = module.c Event_Hooks.c CFV.c Process_List.c\ Drawing.c + +libguiControlFlow_la_HEADERS = Event_Hooks.h CFV.h Process_List.h\ + Drawing.h diff --git a/ltt/branches/poly/lttv/modules/icons/Makefile.am b/ltt/branches/poly/lttv/modules/icons/Makefile.am new file mode 100644 index 00000000..101c5d21 --- /dev/null +++ b/ltt/branches/poly/lttv/modules/icons/Makefile.am @@ -0,0 +1,9 @@ +# +# Makefile for LTT New generation user interface. +# +# Created by Mathieu Desnoyers on May 6, 2003 +# + +EXTRA_DIST = \ + hGuiControlFlowInsert.xpm\ + hGuiEventsInsert.xpm -- 2.34.1