[oprof-cvs] CVS: oprofile ChangeLog,1.750,1.751 Makefile.am,1.5,1.6 configure.in,1.130,1.131

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

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

Modified Files:
	ChangeLog Makefile.am configure.in 
Log Message:
Some more fixes for the build. make distcheck works now (when not module compiling, naturally)



Index: ChangeLog
===================================================================
RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v
retrieving revision 1.750
retrieving revision 1.751
diff -u -d -r1.750 -r1.751
--- ChangeLog	21 Dec 2002 21:41:54 -0000	1.750
+++ ChangeLog	21 Dec 2002 22:30:25 -0000	1.751
@@ -1,5 +1,12 @@
 2002-12-21  John Levon  <le...@mo...>
 
+	* Makefile.am: list module files explicitly, needed
+	  for make dist from separate objdir
+
+	* configure.in: make both x86/ and ia64/ changelogs
+
+2002-12-21  John Levon  <le...@mo...>
+
 	* module/Makefile.am:
 	* configure.in: remove the ln -s arch in favour of
 	  using -I and AC_SUBST

Index: Makefile.am
===================================================================
RCS file: /cvsroot/oprofile/oprofile/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	14 Nov 2002 15:41:22 -0000	1.5
+++ Makefile.am	21 Dec 2002 22:30:25 -0000	1.6
@@ -12,7 +12,7 @@
 kernel_module:
 	make -C libutil
 	make -C libop
-	(cd $(KSRC) && $(MAKE) SUBDIRS=$(OPROFILE_DIR)/module/arch modules) || exit 1 ;
+	(cd $(KSRC) && $(MAKE) SUBDIRS=$(OPROFILE_DIR)/module/@OPROFILE_MODULE_ARCH@ modules) || exit 1 ;
 	(cd $(KSRC) && $(MAKE) SUBDIRS=$(OPROFILE_DIR)/module modules) || exit 1 ;
 
 install.kernel: kernel_module
@@ -22,9 +22,18 @@
 endif
 
 clean-local:
-	rm -f module/*.o module/arch/*.o module/.*.o.cmd module/.*.o.flags module/arch/.*.o.cmd module/arch/.*.o.flags
-
-EXTRA_DIST = ChangeLog-2001 autogen.sh include/sstream module/*.c module/*.h module/Makefile.in module/x86/*.h module/x86/*.c module/x86/*.S module/x86/Makefile.in module/ia64/*.h module/ia64/*.c module/ia64/*.S module/ia64/Makefile.in
+	rm -f module/*.o module/@OPROFILE_MODULE_ARCH@/*.o \
+	module/.*.o.cmd module/.*.o.flags \
+	module/@OPROFILE_MODULE_ARCH@/.*.o.cmd module/@OPROFILE_MODULE_ARCH@/.*.o.flags
 
-dist-hook:
-	rmdir $(distdir)/module/arch
+EXTRA_DIST = ChangeLog-2001 autogen.sh include/sstream \
+	module/Makefile.in \
+	module/compat.c module/op_dname.c module/op_init.c module/oprofile.c module/op_util.c \
+	module/compat22.h module/compat24.h module/compat.h module/op_cache.h module/op_dcache.h module/oprofile.h module/op_util.h \
+	module/ia64/Makefile.in module/ia64/oprofile_stubs.S \
+	module/ia64/cpu_type.c module/ia64/op_pmu.c module/ia64/op_syscalls.c \
+	module/ia64/IA64entry.h module/ia64/IA64minstate.h module/ia64/IA64syscallstub.h module/ia64/op_arch.h module/ia64/op_ia64_model.h \
+	module/x86/Makefile.in module/x86/hammer_entry.S module/x86/hammer_ia32entry.S module/x86/hammer_oprofile_nmi.S module/x86/oprofile_nmi.S \
+	module/x86/apic_compat.h module/x86/op_apic.h module/x86/op_arch.h module/x86/op_x86_model.h module/x86/op_msr.h \
+	module/x86/cpu_type.c module/x86/hammer_op_syscalls.c module/x86/op_apic.c module/x86/op_fixmap.c module/x86/op_model_athlon.c \
+	module/x86/op_model_p4.c module/x86/op_model_ppro.c module/x86/op_nmi.c module/x86/op_rtc.c module/x86/op_syscalls.c

Index: configure.in
===================================================================
RCS file: /cvsroot/oprofile/oprofile/configure.in,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- configure.in	21 Dec 2002 21:41:54 -0000	1.130
+++ configure.in	21 Dec 2002 22:30:25 -0000	1.131
@@ -341,7 +341,8 @@
 	gui/Makefile \
 	gui/ui/Makefile \
 	module/Makefile \
-	module/arch/Makefile \
+	module/x86/Makefile \
+	module/ia64/Makefile \
 	version.h)
 
 if test -z "$QT_LIB"; then