27 files changed, 74 insertions, 72 deletions
diff --git a/logview/Makefile.am b/logview/Makefile.am
index 271947d3..d77eddc5 100644
--- a/logview/Makefile.am
+++ b/logview/Makefile.am
@@ -1,73 +1,2 @@
-SUBDIRS = data help tests
-
-AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"mate-system-log\"			\
-	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
-	-DDATADIR=\""$(datadir)"\"				\
-	-DLOGVIEWINSTALLPREFIX=\""$(prefix)/\""			\
-	-DLOGVIEW_DATADIR=\""$(pkgdatadir)"\"			\
-	$(SUN_OS)						\
-	$(DISABLE_DEPRECATED)					\
-	$(NULL)
-
-bin_PROGRAMS = mate-system-log
-
-BUILT_SOURCES = 		\
-	logview-marshal.c	\
-	logview-marshal.h
-
-mate_system_log_SOURCES = 	\
-	logview-app.c		\
-	logview-app.h		\
-	logview-main.c		\
-	logview-about.h		\
-	logview-manager.c	\
-	logview-manager.h	\
-	logview-utils.c		\
-	logview-utils.h		\
-	logview-loglist.c	\
-	logview-loglist.h	\
-	logview-window.c	\
-	logview-window.h	\
-	logview-log.h		\
-	logview-log.c		\
-	logview-findbar.h	\
-	logview-findbar.c	\
-	logview-prefs.c		\
-	logview-prefs.h		\
-	logview-filter.h       \
-	logview-filter.c       \
-	logview-filter-manager.h       \
-	logview-filter-manager.c  \
-	$(BUILT_SOURCES)
-
-mate_system_log_CFLAGS =	\
-	$(GLIB_CFLAGS)		\
-	$(GTHREAD_CFLAGS)	\
-	$(GIO_CFLAGS)		\
-	$(GTK_CFLAGS)		\
-	$(NULL)
-
-mate_system_log_LDADD =	\
-	$(GLIB_LIBS)		\
-	$(GIO_LIBS)		\
-	$(GTHREAD_LIBS)		\
-	$(GTK_LIBS)		\
-	$(Z_LIBS)		\
-	-lm
-
-logview-marshal.h: logview-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --header --prefix=logview_marshal >> $@
-
-logview-marshal.c: logview-marshal.list $(GLIB_GENMARSHAL)
-	echo "#include \"logview-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) $< --body --prefix=logview_marshal >> $@
-
-EXTRA_DIST = logview-marshal.list
-
-CLEANFILES = 				\
-	$(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir) ; rm -f $(CLEANFILES)
+SUBDIRS = data help src
 
diff --git a/logview/src/Makefile.am b/logview/src/Makefile.am
new file mode 100644
index 00000000..70cbee21
--- /dev/null
+++ b/logview/src/Makefile.am
@@ -0,0 +1,73 @@
+SUBDIRS = tests
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"mate-system-log\"			\
+	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	-DDATADIR=\""$(datadir)"\"				\
+	-DLOGVIEWINSTALLPREFIX=\""$(prefix)/\""			\
+	-DLOGVIEW_DATADIR=\""$(pkgdatadir)"\"			\
+	$(SUN_OS)						\
+	$(DISABLE_DEPRECATED)					\
+	$(NULL)
+
+bin_PROGRAMS = mate-system-log
+
+BUILT_SOURCES = 		\
+	logview-marshal.c	\
+	logview-marshal.h
+
+mate_system_log_SOURCES = 	\
+	logview-app.c		\
+	logview-app.h		\
+	logview-main.c		\
+	logview-about.h		\
+	logview-manager.c	\
+	logview-manager.h	\
+	logview-utils.c		\
+	logview-utils.h		\
+	logview-loglist.c	\
+	logview-loglist.h	\
+	logview-window.c	\
+	logview-window.h	\
+	logview-log.h		\
+	logview-log.c		\
+	logview-findbar.h	\
+	logview-findbar.c	\
+	logview-prefs.c		\
+	logview-prefs.h		\
+	logview-filter.h       \
+	logview-filter.c       \
+	logview-filter-manager.h       \
+	logview-filter-manager.c  \
+	$(BUILT_SOURCES)
+
+mate_system_log_CFLAGS =	\
+	$(GLIB_CFLAGS)		\
+	$(GTHREAD_CFLAGS)	\
+	$(GIO_CFLAGS)		\
+	$(GTK_CFLAGS)		\
+	$(NULL)
+
+mate_system_log_LDADD =	\
+	$(GLIB_LIBS)		\
+	$(GIO_LIBS)		\
+	$(GTHREAD_LIBS)		\
+	$(GTK_LIBS)		\
+	$(Z_LIBS)		\
+	-lm
+
+logview-marshal.h: logview-marshal.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) $< --header --prefix=logview_marshal >> $@
+
+logview-marshal.c: logview-marshal.list $(GLIB_GENMARSHAL)
+	echo "#include \"logview-marshal.h\"" > $@ && \
+	$(GLIB_GENMARSHAL) $< --body --prefix=logview_marshal >> $@
+
+EXTRA_DIST = logview-marshal.list
+
+CLEANFILES = 				\
+	$(BUILT_SOURCES)
+
+dist-hook:
+	cd $(distdir) ; rm -f $(CLEANFILES)
+
diff --git a/logview/logview-about.h b/logview/src/logview-about.h
index 9b4b0949..9b4b0949 100644
--- a/logview/logview-about.h
+++ b/logview/src/logview-about.h
diff --git a/logview/logview-app.c b/logview/src/logview-app.c
index ffa37ec7..ffa37ec7 100644
--- a/logview/logview-app.c
+++ b/logview/src/logview-app.c
diff --git a/logview/logview-app.h b/logview/src/logview-app.h
index 3ce7c059..3ce7c059 100644
--- a/logview/logview-app.h
+++ b/logview/src/logview-app.h
diff --git a/logview/logview-filter-manager.c b/logview/src/logview-filter-manager.c
index 0905306f..0905306f 100644
--- a/logview/logview-filter-manager.c
+++ b/logview/src/logview-filter-manager.c
diff --git a/logview/logview-filter-manager.h b/logview/src/logview-filter-manager.h
index c33ea1f7..c33ea1f7 100644
--- a/logview/logview-filter-manager.h
+++ b/logview/src/logview-filter-manager.h
diff --git a/logview/logview-filter.c b/logview/src/logview-filter.c
index b5f9cfc6..b5f9cfc6 100644
--- a/logview/logview-filter.c
+++ b/logview/src/logview-filter.c
diff --git a/logview/logview-filter.h b/logview/src/logview-filter.h
index 6eb827b8..6eb827b8 100644
--- a/logview/logview-filter.h
+++ b/logview/src/logview-filter.h
diff --git a/logview/logview-findbar.c b/logview/src/logview-findbar.c
index 3cb53f1d..3cb53f1d 100644
--- a/logview/logview-findbar.c
+++ b/logview/src/logview-findbar.c
diff --git a/logview/logview-findbar.h b/logview/src/logview-findbar.h
index 89c65249..89c65249 100644
--- a/logview/logview-findbar.h
+++ b/logview/src/logview-findbar.h
diff --git a/logview/logview-log.c b/logview/src/logview-log.c
index 407f49c3..407f49c3 100644
--- a/logview/logview-log.c
+++ b/logview/src/logview-log.c
diff --git a/logview/logview-log.h b/logview/src/logview-log.h
index 4f81af14..4f81af14 100644
--- a/logview/logview-log.h
+++ b/logview/src/logview-log.h
diff --git a/logview/logview-loglist.c b/logview/src/logview-loglist.c
index 847626d9..847626d9 100644
--- a/logview/logview-loglist.c
+++ b/logview/src/logview-loglist.c
diff --git a/logview/logview-loglist.h b/logview/src/logview-loglist.h
index ebfbf04f..ebfbf04f 100644
--- a/logview/logview-loglist.h
+++ b/logview/src/logview-loglist.h
diff --git a/logview/logview-main.c b/logview/src/logview-main.c
index 74dcb44b..74dcb44b 100644
--- a/logview/logview-main.c
+++ b/logview/src/logview-main.c
diff --git a/logview/logview-manager.c b/logview/src/logview-manager.c
index 54b5320b..54b5320b 100644
--- a/logview/logview-manager.c
+++ b/logview/src/logview-manager.c
diff --git a/logview/logview-manager.h b/logview/src/logview-manager.h
index b9444323..b9444323 100644
--- a/logview/logview-manager.h
+++ b/logview/src/logview-manager.h
diff --git a/logview/logview-marshal.list b/logview/src/logview-marshal.list
index 38076d6c..38076d6c 100644
--- a/logview/logview-marshal.list
+++ b/logview/src/logview-marshal.list
diff --git a/logview/logview-prefs.c b/logview/src/logview-prefs.c
index 0a2e0093..0a2e0093 100644
--- a/logview/logview-prefs.c
+++ b/logview/src/logview-prefs.c
diff --git a/logview/logview-prefs.h b/logview/src/logview-prefs.h
index bc9c6608..bc9c6608 100644
--- a/logview/logview-prefs.h
+++ b/logview/src/logview-prefs.h
diff --git a/logview/logview-utils.c b/logview/src/logview-utils.c
index c8a61ed1..c8a61ed1 100644
--- a/logview/logview-utils.c
+++ b/logview/src/logview-utils.c
diff --git a/logview/logview-utils.h b/logview/src/logview-utils.h
index 27242917..27242917 100644
--- a/logview/logview-utils.h
+++ b/logview/src/logview-utils.h
diff --git a/logview/logview-window.c b/logview/src/logview-window.c
index d0728f92..d0728f92 100644
--- a/logview/logview-window.c
+++ b/logview/src/logview-window.c
diff --git a/logview/logview-window.h b/logview/src/logview-window.h
index f9fd5303..f9fd5303 100644
--- a/logview/logview-window.h
+++ b/logview/src/logview-window.h
diff --git a/logview/tests/Makefile.am b/logview/src/tests/Makefile.am
index b7b668c3..b7b668c3 100644
--- a/logview/tests/Makefile.am
+++ b/logview/src/tests/Makefile.am
diff --git a/logview/tests/test-reader.c b/logview/src/tests/test-reader.c
index b9ef5d40..b9ef5d40 100644
--- a/logview/tests/test-reader.c
+++ b/logview/src/tests/test-reader.c