MainLib revert part 4

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

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 943d73a3955389e489bafaf0ff2b793da1866fbb..c6ac86614b3492a40c7eee910f802ef8745f99f8 100644 (file)
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -75,6 +75,7 @@ AC_SUBST(lttincludedir)
 
 AC_CONFIG_FILES([Makefile
                 lttv/Makefile
+                lttv/main/Makefile
                 lttv/modules/Makefile
                 lttv/modules/text/Makefile
                 lttv/modules/gui/Makefile

diff --git a/ltt/branches/poly/lttv/Makefile.am b/ltt/branches/poly/lttv/Makefile.am
index f92fa54cc6ccd1532b5d19aba45afd2adb18ac97..9f26d16ebbc504c0f19c31e60a8bc66ba83094d7 100644 (file)
--- a/ltt/branches/poly/lttv/Makefile.am
+++ b/ltt/branches/poly/lttv/Makefile.am
@@ -1,14 +1,4 @@
-AM_CFLAGS = $(GLIB_CFLAGS) 
-LIBS += $(GLIB_LIBS) -lgobject-2.0 -L$(top_srcdir)/ltt -ltraceread
-
-bin_PROGRAMS = lttv
-
-lttv_SOURCES = main/main.c mainLib/module.c mainLib/option.c \
-               mainLib/hook.c mainLib/attribute.c \
-               mainLib/iattribute.c mainLib/processTrace.c \
-                                                        mainLib/state.c mainLib/stats.c mainLib/traceset.c
-
-# WARNING : must be done at the end, so modules can dynamically link themselves
-# to libraries compiled here but not installed in the system.
-SUBDIRS = modules
+# WARNING : modules must be done at the end, so modules can dynamically link
+# themselves to libraries compiled here but not installed in the system.
+SUBDIRS = main modules
 

diff --git a/ltt/branches/poly/lttv/main/Makefile.am b/ltt/branches/poly/lttv/main/Makefile.am
new file mode 100644 (file)
index 0000000..24d8bc2
--- /dev/null
+++ b/ltt/branches/poly/lttv/main/Makefile.am
@@ -0,0 +1,10 @@
+AM_CFLAGS = $(GLIB_CFLAGS) 
+LIBS += $(GLIB_LIBS) -lgobject-2.0 -L$(top_srcdir)/ltt -ltraceread
+
+bin_PROGRAMS = lttv
+
+lttv_SOURCES = main.c module.c option.c \
+               hook.c attribute.c \
+               iattribute.c processTrace.c \
+                                                        state.c stats.c traceset.c
+