[oprof-cvs] CVS: oprofile ChangeLog,1.1332,1.1333 HACKING,1.10,1.11 Makefile.am,1.16,1.17 configure.in,1.194,1.195

[John L. <mov...@us...>]

Update of /cvsroot/oprofile/oprofile
In directory sc8-pr-cvs1:/tmp/cvs-serv4594

Modified Files:
	ChangeLog HACKING Makefile.am configure.in 
Log Message:
Finally ! Merge the 2.4 daemon code into daemon/liblegacy


Index: ChangeLog
===================================================================
RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v
retrieving revision 1.1332
retrieving revision 1.1333
diff -u -p -d -r1.1332 -r1.1333
--- ChangeLog	26 Oct 2003 00:36:21 -0000	1.1332
+++ ChangeLog	26 Oct 2003 02:09:30 -0000	1.1333
@@ -1,5 +1,25 @@
 2003-10-26  John Levon  <le...@mo...>
 
+	* HACKING:
+	* configure.in:
+	* Makefile.am:
+	* dae/: move all of 2.4 daemon code to ...
+
+	* daemon/liblegacy/: here
+
+	* daemon/Makefile.am:
+	* daemon/opd_util.h:
+	* daemon/opd_util.c: move to ...
+
+	* daemon/oprofiled.h:
+	* daemon/oprofiled.c: here, and call the right operations
+	depending upon oprofile kernel version.
+
+	* daemon/init.c:
+	* daemon/liblegacy/init.c: init and running for each version
+
+2003-10-26  John Levon  <le...@mo...>
+
 	* daemon/opd_cookie.c: make sure to create the
 	cookie for the ignore value if it's not found
 

Index: HACKING
===================================================================
RCS file: /cvsroot/oprofile/oprofile/HACKING,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -d -r1.10 -r1.11
--- HACKING	20 Sep 2003 23:04:00 -0000	1.10
+++ HACKING	26 Oct 2003 02:09:30 -0000	1.11
@@ -19,13 +19,9 @@ module/
 
 	The 2.4 module code. Sub-directories contain architecture-specific code.
 
-dae/
-
-	The 2.4 daemon which writes the kernel data to the sample files.
-
 daemon/
 
-	The 2.5+ daemon
+	The daemon. liblegacy/ contains the daemon core for 2.4
 
 utils/
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/oprofile/oprofile/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -d -r1.16 -r1.17
--- Makefile.am	25 Sep 2003 18:59:24 -0000	1.16
+++ Makefile.am	26 Oct 2003 02:09:30 -0000	1.17
@@ -9,7 +9,6 @@ SUBDIRS = \
 	libabi \
 	libregex \
 	daemon \
-	dae \
 	utils \
 	libpp \
 	pp \

Index: configure.in
===================================================================
RCS file: /cvsroot/oprofile/oprofile/configure.in,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -d -r1.194 -r1.195
--- configure.in	23 Oct 2003 15:56:31 -0000	1.194
+++ configure.in	26 Oct 2003 02:09:30 -0000	1.195
@@ -186,8 +186,8 @@ AC_OUTPUT(Makefile \
 	libregex/tests/Makefile \
 	libregex/stl.pat \
 	libregex/tests/mangled-name \
-	dae/Makefile \
 	daemon/Makefile \
+	daemon/liblegacy/Makefile \
 	events/Makefile \
 	utils/Makefile \
 	doc/Makefile \