Patch to fix dependency tracking problems

[Maciej Stachowiak <mjs noisehavoc org>]

This patch fixes one small problem with dependency tracking that
Micheal Meeks found, turns dependency tracking back on, and puts a
--noheaders back that I think is helpful though not necessary. I
tested this by doing a fresh chechout, applying my diffs, autogen-ing,
configuring, doing a build and then a make distcheck.


Tail end of my successfull distcheck:


make[3]: Entering directory `/gnome/head/cvs/ORBit2/ORBit-2.3.94/=build/docs/devel'
make[3]: Leaving directory `/gnome/head/cvs/ORBit2/ORBit-2.3.94/=build/docs/devel'
make[3]: Entering directory `/gnome/head/cvs/ORBit2/ORBit-2.3.94/=build/docs/internals'
make[3]: Leaving directory `/gnome/head/cvs/ORBit2/ORBit-2.3.94/=build/docs/internals'
make[2]: Leaving directory `/gnome/head/cvs/ORBit2/ORBit-2.3.94/=build/docs'
make  top_distdir="ORBit-2.3.94" distdir="ORBit-2.3.94" dist-hook
make[2]: Entering directory `/gnome/head/cvs/ORBit2/ORBit-2.3.94/=build'
cp ORBit.spec ORBit-2.3.94
make[2]: Leaving directory `/gnome/head/cvs/ORBit2/ORBit-2.3.94/=build'
chmod -R a+r ORBit-2.3.94
GZIP=--best gtar chozf ORBit-2.3.94.tar.gz ORBit-2.3.94
rm -rf ORBit-2.3.94
make[1]: Leaving directory `/gnome/head/cvs/ORBit2/ORBit-2.3.94/=build'
rm -rf ORBit-2.3.94
=============================================
ORBit-2.3.94.tar.gz is ready for distribution
=============================================


Patch:


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/ORBit2/ChangeLog,v
retrieving revision 1.147
diff -u -r1.147 ChangeLog
--- ChangeLog	2001/08/24 18:56:44	1.147
+++ ChangeLog	2001/08/25 01:32:34
@@ -1,3 +1,11 @@
+2001-08-24  Maciej Stachowiak  <mjs@noisehavoc.org>
+
+	* Makefile.shared: Re-enable generating deps, fixing a potential
+	distcheck-breaking problem.
+	
+	* src/orb/orb-core/Makefile.am: Re-disable generating headers;
+	they are generated in include/orbit/orb-core.
+
 2001-08-24  Michael Meeks  <michael@ximian.com>
 
 	* Version 2.3.94
Index: Makefile.shared
===================================================================
RCS file: /cvs/gnome/ORBit2/Makefile.shared,v
retrieving revision 1.2
diff -u -r1.2 Makefile.shared
--- Makefile.shared	2001/08/24 18:56:44	1.2
+++ Makefile.shared	2001/08/25 01:32:34
@@ -2,7 +2,7 @@
 
 %.h %-stubs.c %-skels.c %-common.c %-imodule.c %-skelimpl.c: $(IDL_DIR)%.idl $(IDL_COMPILER)
 	-(rm -f $(*).h $(*)-stubs.c $(*)-skels.c $(*)-common.c $(*)-imodule.c $(*)-skelimpl.c || true) > /dev/null
-	$(IDL_COMPILER) $(IDL_FLAGS) $<
+	$(IDL_COMPILER) $(IDL_FLAGS) --deps $(*D)/.deps/$(*F) $< 
 	for I in $(*).h $(*)-stubs.c $(*)-skels.c $(*)-common.c $(*)-imodule.c $(*)-skelimpl.c; do \
 		if test -f $$I; then \
 			sed -e 's,OObject,Object,g' -e 's,TTypeCode,TypeCode,g' $$I > $$I.out; \
Index: src/orb/orb-core/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/src/orb/orb-core/Makefile.am,v
retrieving revision 1.29
diff -u -r1.29 Makefile.am
--- src/orb/orb-core/Makefile.am	2001/08/24 18:56:45	1.29
+++ src/orb/orb-core/Makefile.am	2001/08/25 01:32:34
@@ -54,7 +54,7 @@
 	-I$(top_srcdir)/src/idl/CORBA				\
 	-I$(top_srcdir)/src/idl/misc				\
 	-I$(top_srcdir)/src/idl/interop				\
-	--noskels --nodefskels --nostubs --noidata		\
+	--noskels --nodefskels --nostubs --noidata --noheaders	\
 	--define=Object=OObject --define=TypeCode=TTypeCode	\
         --showcpperrors
 IDL_FILES=corba-defs.idl iop-defs.idl corba-ops.idl orbit-interface.idl