? Makefile.idlc
? Makefile.idlc-old
? warnings
? warnings-after
? warnings-fixed
? warnings-icc
? warnings-sparse
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/Makefile.am,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile.am
--- Makefile.am	24 Jul 2006 15:53:26 -0000	1.22
+++ Makefile.am	7 Aug 2006 10:48:47 -0000
@@ -14,6 +14,7 @@ EXTRA_DIST =		\
 	MAINTAINERS	\
 	README.win32	\
 	Makefile.shared \
+	Makefile.idlc	\
 	gtk-doc.make
 
 rpms: distcheck
Index: configure.in
===================================================================
RCS file: /cvs/gnome/ORBit2/configure.in,v
retrieving revision 1.171
diff -u -p -r1.171 configure.in
--- configure.in	24 Jul 2006 14:27:17 -0000	1.171
+++ configure.in	7 Aug 2006 10:48:48 -0000
@@ -76,7 +76,7 @@ AC_PROG_INSTALL
 
 AC_LIBTOOL_DLOPEN
 AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 AM_MAINTAINER_MODE
 
 dnl Useful for automating stuff
Index: docs/api/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/docs/api/Makefile.am,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.am
--- docs/api/Makefile.am	28 Jun 2003 10:30:16 -0000	1.3
+++ docs/api/Makefile.am	7 Aug 2006 10:48:48 -0000
@@ -60,5 +60,5 @@ DOC_OVERRIDES =
 
 
 # include common portion ...
-include $(top_srcdir)/gtk-doc.make
+##include $(top_srcdir)/gtk-doc.make
 
Index: include/orbit/dynamic/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/dynamic/Makefile.am,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.am
--- include/orbit/dynamic/Makefile.am	19 Sep 2001 17:15:35 -0000	1.4
+++ include/orbit/dynamic/Makefile.am	7 Aug 2006 10:48:48 -0000
@@ -3,19 +3,20 @@ dynamicinclude_HEADERS= \
 	dynamic.h	\
 	dynamic-defs.h
 
-BUILT_SOURCES=dynamic-defs.h
+BUILT_SOURCES=
 
-IDL_FLAGS=-I$(top_srcdir)/src/idl/CORBA_PIDL			\
+IDL_DIR=$(top_srcdir)/src/orb/dynamic/
+IDL_FILES=dynamic-defs.idl
+dynamic_defs_idl_IDLCFLAGS = \
+	-I$(top_srcdir)/src/idl/CORBA_PIDL			\
 	-I$(top_srcdir)/src/idl/CORBA				\
 	-I$(top_srcdir)/src/orb/orb-core			\
 	-I$(top_srcdir)/src/idl/misc				\
 	--define=Object=OObject --define=TypeCode=TTypeCode	\
 	--noskels --nodefskels --nostubs --nocommon --noidata	\
         --showcpperrors 
-IDL_DIR=$(top_srcdir)/src/orb/dynamic/
-IDL_FILES=dynamic-defs.idl
-
-include $(top_srcdir)/Makefile.shared
+dynamic_defs_idl_IDLOUTFILES = dynamic-defs.h
+include $(top_srcdir)/Makefile.idlc
 
-CLEANFILES=$(BUILT_SOURCES)
+CLEANFILES=$(BUILT_SOURCES) $(IDL_CLEAN)
 
Index: include/orbit/orb-core/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/orb-core/Makefile.am,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile.am
--- include/orbit/orb-core/Makefile.am	12 Nov 2004 16:00:34 -0000	1.14
+++ include/orbit/orb-core/Makefile.am	7 Aug 2006 10:48:48 -0000
@@ -27,7 +27,7 @@ orbcoreinclude_HEADERS =		\
 	corba-any-type.h		\
 	orbit-interface.h
 
-BUILT_SOURCES = corba-defs.h iop-defs.h orbit-interface.h
+BUILT_SOURCES =
 
 IDL_FLAGS_NO_DEFS = -I$(top_srcdir)/src/idl/CORBA_PIDL	\
 	-I$(top_srcdir)/src/idl/CORBA			\
@@ -39,14 +39,19 @@ IDL_FLAGS_NO_DEFS = -I$(top_srcdir)/src/
 IDL_FLAGS = $(IDL_FLAGS_NO_DEFS)		\
 	 --define=Object=OObject		\
 	--define=TypeCode=TTypeCode
+
 IDL_FILES=corba-defs.idl iop-defs.idl orbit-interface.idl
 IDL_DIR=$(top_srcdir)/src/orb/orb-core/
+corba_defs_idl_IDLCFLAGS=$(IDL_FLAGS)
+corba_defs_idl_IDLOUTFILES = corba-defs.h
+iop_defs_idl_IDLCFLAGS=$(IDL_FLAGS)
+iop_defs_idl_IDLOUTFILES = iop-defs.h
+orbit_interface_idl_IDLCFLAGS=$(IDL_FLAGS_NO_DEFS)
+orbit_interface_idl_IDLOUTFILES = orbit-interface.h
 
-include $(top_srcdir)/Makefile.shared
-
-orbit-interface.h: $(top_srcdir)/src/orb/orb-core/orbit-interface.idl $(IDL_COMPILER)
-	-(rm -f orbit-interface.h || true ) > /dev/null
-	$(IDL_COMPILER) $(IDL_FLAGS_NO_DEFS) --deps .deps/orbit-interface.idl.P $<
+include $(top_srcdir)/Makefile.idlc
 
+orbit-interface.idl-pcstamp: orbit-interface.idl-cstamp
+	touch $@
 
-CLEANFILES=$(BUILT_SOURCES)
+CLEANFILES=$(BUILT_SOURCES) $(IDL_CLEAN)
Index: include/orbit/poa/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/poa/Makefile.am,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.am
--- include/orbit/poa/Makefile.am	19 Sep 2001 17:15:36 -0000	1.7
+++ include/orbit/poa/Makefile.am	7 Aug 2006 10:48:48 -0000
@@ -10,17 +10,20 @@ poainclude_HEADERS= \
 	orbit-adaptor.h
 
 
-BUILT_SOURCES = poa-defs.h
+BUILT_SOURCES =
 
-IDL_FLAGS =  -I$(top_srcdir)/src/idl/CORBA_PIDL				\
+IDL_FILES=poa-defs.idl
+IDL_DIR=$(top_srcdir)/src/orb/poa
+
+poa_defs_idl_IDLCFLAGS =  -I$(top_srcdir)/src/idl/CORBA_PIDL				\
 	-I$(top_srcdir)/src/idl/CORBA					\
 	-I$(top_srcdir)/src/orb/orb-core				\
 	-I$(top_srcdir)/src/idl/misc					\
 	--define=Object=OObject --define=TypeCode=TTypeCode		\
 	--noskels --nodefskels --nostubs --nocommon --noidata		\
         --showcpperrors
-IDL_FILES=poa-defs.idl
-IDL_DIR=$(top_srcdir)/src/orb/poa/
-include $(top_srcdir)/Makefile.shared
+poa_defs_idl_IDLOUTFILES=poa-defs.h
+
+include $(top_srcdir)/Makefile.idlc
 
-CLEANFILES=$(BUILT_SOURCES)
+CLEANFILES=$(BUILT_SOURCES) $(IDL_CLEAN)
Index: src/orb/dynamic/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/src/orb/dynamic/Makefile.am,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile.am
--- src/orb/dynamic/Makefile.am	19 Jun 2003 20:13:25 -0000	1.17
+++ src/orb/dynamic/Makefile.am	7 Aug 2006 10:48:48 -0000
@@ -1,8 +1,7 @@
 noinst_LTLIBRARIES=liborb-dynamic.la
 
-DYNAMIC_IDLOUT=dynamic-defs-common.c
 liborb_dynamic_la_SOURCES= \
-	$(DYNAMIC_IDLOUT) \
+	$(dynamic_defs_idl_IDLOUTFILES) \
 	dynany.c
 
 INCLUDES =						\
@@ -17,18 +16,19 @@ INCLUDES =						\
 	$(LOCAL_LINC_CFLAGS)				\
 	$(ORBIT_CFLAGS)
 
-IDL_FLAGS= -I$(top_srcdir)/src/idl/CORBA_PIDL			\
+IDL_FILES=dynamic-defs.idl
+dynamic_defs_idl_IDLCFLAGS= -I$(top_srcdir)/src/idl/CORBA_PIDL			\
 	--define=Object=OObject --define=TypeCode=TTypeCode	\
 	-I$(top_srcdir)/src/idl/CORBA				\
 	-I$(top_srcdir)/src/idl/misc				\
 	-I$(top_srcdir)/src/orb/orb-core			\
 	--noskels --nodefskels --nostubs --noidata --noheaders  \
 	--showcpperrors
-IDL_FILES=dynamic-defs.idl
-include $(top_srcdir)/Makefile.shared
+dynamic_defs_idl_IDLOUTFILES=dynamic-defs-common.c
+include $(top_srcdir)/Makefile.idlc
 
-BUILT_SOURCES = $(DYNAMIC_IDLOUT)
-CLEANFILES = $(BUILT_SOURCES)
+BUILT_SOURCES = 
+CLEANFILES = $(BUILT_SOURCES) $(IDL_CLEAN)
 EXTRA_DIST = $(IDL_FILES)
 
 dist-hook:
Index: src/orb/orb-core/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/src/orb/orb-core/Makefile.am,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile.am
--- src/orb/orb-core/Makefile.am	1 May 2004 22:56:58 -0000	1.55
+++ src/orb/orb-core/Makefile.am	7 Aug 2006 10:48:48 -0000
@@ -51,17 +51,12 @@ main_src = \
 	$(ORBHTTP) 
 
 liborb_core_la_SOURCES= \
-	$(BUILT_SOURCES) \
+	$(corba_defs_idl_IDLOUTFILES) \
+	$(iop_defs_idl_IDLOUTFILES) \
+	$(corba_ops_idl_IDLOUTFILES) \
+	$(orbit_interface_idl_IDLOUTFILES) \
 	$(main_src)
 
-IDLOUT=corba-defs-common.c
-DEFS_IDLOUT=iop-defs-common.c
-OPS_IDLOUT_H= corba-ops.h
-OPS_IDLOUT_C= corba-ops-stubs.c corba-ops-common.c corba-ops-skels.c
-IFACE_IDLOUT=orbit-interface-common.c
-
-$(liborb_core_la_OBJECTS) : $(BUILT_SOURCES)
-
 IDL_FLAGS = -I$(top_srcdir)/src/idl/CORBA_PIDL			\
 	-I$(top_srcdir)/src/idl/CORBA				\
 	-I$(top_srcdir)/src/idl/misc				\
@@ -70,30 +65,36 @@ IDL_FLAGS = -I$(top_srcdir)/src/idl/CORB
 	--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
-IDL_DIR=$(top_srcdir)/src/orb/orb-core/
-include $(top_srcdir)/Makefile.shared
-
-IDL_FLAGS_CORBA_OPS = --showcpperrors
-$(OPS_IDLOUT_C): $(OPS_IDLOUT_H)
-	true
-
-$(OPS_IDLOUT_H): corba-ops.idl $(IDL_COMPILER)
-	-(rm -f $(OPS_IDLOUT_C) $(OPS_IDLOUT_H) || true) > /dev/null
-	$(IDL_COMPILER) $(IDL_FLAGS_CORBA_OPS) --deps .deps/corba-ops.idl.P $<
-	for I in $(OPS_IDLOUT_C) $(OPS_IDLOUT_H); do								\
+
+IDL_FILES = corba-defs.idl iop-defs.idl corba-ops.idl orbit-interface.idl
+
+corba_defs_idl_IDLCFLAGS = $(IDL_FLAGS)
+corba_defs_idl_IDLOUTFILES = corba-defs-common.c
+
+iop_defs_idl_IDLCFLAGS = $(IDL_FLAGS)
+iop_defs_idl_IDLOUTFILES = iop-defs-common.c
+
+corba_ops_idl_IDLCFLAGS = --showcpperrors
+corba_ops_idl_IDLOUTFILES = corba-ops.h corba-ops-stubs.c corba-ops-common.c corba-ops-skels.c
+
+orbit_interface_idl_IDLCFLAGS = --nostubs --noskels --showcpperrors --noheaders
+orbit_interface_idl_IDLOUTFILES = orbit-interface-common.c
+
+include $(top_srcdir)/Makefile.idlc
+
+corba-ops.idl-pcstamp: corba-ops.idl-cstamp
+	for I in $($(call cname,corba-ops.idl_IDLOUTFILES)); do								\
 		sed -e 's,ZZZis_a,_is_a,g' -e 's,ZZis_a,is_a,g' $$I > $$I.out; mv $$I.out $$I;	\
 	done;											\
 	sed -e "s,Z,_,g" corba-ops-skels.c > corba-ops-skels.c.out;				\
 	mv corba-ops-skels.c.out corba-ops-skels.c;
+	touch $@
 
-IDL_FLAGS_INTERFACE = --nostubs --noskels --showcpperrors --noheaders
-$(IFACE_IDLOUT) : orbit-interface.idl $(IDL_COMPILER)
-	-(rm -f $(IFACE_IDLOUT) || true) > /dev/null
-	$(IDL_COMPILER) $(IDL_FLAGS_INTERFACE) --deps .deps/orbit-interface.idl.P $<
+orbit-interface.idl-pcstamp: orbit-interface.idl-cstamp
+	touch $@
 
-BUILT_SOURCES = $(IFACE_IDLOUT) $(IDLOUT) $(DEFS_IDLOUT) $(OPS_IDLOUT_C) $(OPS_IDLOUT_H)
-CLEANFILES = $(BUILT_SOURCES)
+##BUILT_SOURCES = $(IDL_BUILT)
+CLEANFILES = $(IDL_CLEAN)
 EXTRA_DIST = $(IDL_FILES) $(HTTP_FILES)
 
 dist-hook:
Index: src/orb/poa/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/src/orb/poa/Makefile.am,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile.am
--- src/orb/poa/Makefile.am	1 May 2004 22:56:58 -0000	1.28
+++ src/orb/poa/Makefile.am	7 Aug 2006 10:48:48 -0000
@@ -1,7 +1,5 @@
 noinst_LTLIBRARIES=liborb-poa.la
 
-IDL = $(top_builddir)/src/idl-compiler/orbit-idl-2
-
 INCLUDES =						\
 	-I$(top_srcdir)/include				\
 	-I$(top_builddir)/include			\
@@ -18,8 +16,6 @@ INCLUDES =						\
 	$(LOCAL_LINC_CFLAGS)				\
 	$(ORBIT_CFLAGS)
 
-POA_IDLOUT=poa-defs-common.c
-
 main_src = \
 	poa.c \
 	orbit-poa-export.h \
@@ -32,10 +28,12 @@ main_src = \
 	orbit-adaptor.c
 
 liborb_poa_la_SOURCES=\
-	$(POA_IDLOUT) \
+	$(poa_defs_idl_IDLOUTFILES) \
 	$(main_src)
 
-IDL_FLAGS= -I$(top_srcdir)/src/idl/CORBA_PIDL			\
+IDL_FILES=poa-defs.idl
+poa_defs_idl_IDLCFLAGS = \
+	-I$(top_srcdir)/src/idl/CORBA_PIDL			\
 	-I$(top_srcdir)/src/idl/CORBA				\
 	-I$(top_srcdir)/src/idl/misc				\
 	-I$(top_srcdir)/src/orb/orb-core			\
@@ -43,11 +41,11 @@ IDL_FLAGS= -I$(top_srcdir)/src/idl/CORBA
 	--noskels --nodefskels --nostubs --noidata --noheaders  \
 	--define=Object=OObject --define=TypeCode=TTypeCode	\
         --showcpperrors
-IDL_FILES=poa-defs.idl
-include $(top_srcdir)/Makefile.shared
+poa_defs_idl_IDLOUTFILES =poa-defs-common.c
+include $(top_srcdir)/Makefile.idlc
 
-BUILT_SOURCES = $(POA_IDLOUT)
-CLEANFILES = $(BUILT_SOURCES)
+BUILT_SOURCES = 
+CLEANFILES = $(BUILT_SOURCES) $(IDL_CLEAN)
 EXTRA_DIST = $(IDL_FILES)
 
 dist-hook:
Index: src/services/name/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/src/services/name/Makefile.am,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile.am
--- src/services/name/Makefile.am	28 Jan 2005 15:46:51 -0000	1.20
+++ src/services/name/Makefile.am	7 Aug 2006 10:48:48 -0000
@@ -36,17 +36,16 @@ INCLUDES =				\
 	$(LOCAL_LINC_CFLAGS)		\
 	$(ORBIT_NAME_CFLAGS)
 
-CosNaming_built = 							\
+IDL_FILES=CosNaming.idl
+CosNaming_idl_IDLCFLAGS = --showcpperrors
+CosNaming_idl_IDLOUTFILES = \
 	CosNaming.h 							\
 	CosNaming-common.c 						\
 	CosNaming-stubs.c 						\
 	CosNaming-skels.c
+include $(top_srcdir)/Makefile.idlc
 
-IDL_FLAGS=--showcpperrors
-IDL_FILES=CosNaming.idl
-include $(top_srcdir)/Makefile.shared
-
-CLEANFILES=my_cosnaming_built $(BUILT_SOURCES)
+CLEANFILES=my_cosnaming_built $(BUILT_SOURCES) $(IDL_CLEAN)
 
 DEPS = 	$(top_builddir)/src/orb/libORBit-2.la			\
 	libORBitCosNaming-2.la
@@ -59,26 +58,24 @@ LDADDS =                                
 
 name_client_2_SOURCES = name-client.c name-support.c name-support.h
 name_client_2_LDFLAGS = $(FLAGS)
-name_client_2_DEPENDENCIES = $(DEPS) CosNaming.h
 name_client_2_LDADD = $(LDADDS)
 
 libname_server_2_a_SOURCES = orbit-name-server.c CosNaming-skels.c \
 			   name-support.c name-support.h
-libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h
+libname_server_2_a_DEPENDENCIES = $(DEPS)
+
+name-client.c name-support.h orbit-name-server.c: CosNaming.h
 
 orbit_name_server_2_SOURCES = boot.c
 orbit_name_server_2_LDFLAGS = $(FLAGS)
-orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h
 orbit_name_server_2_LDADD = libname-server-2.a $(LDADDS)
 
-$(libname_server_2_a_OBJECTS) $(name_client_2_OBJECTS) $(orbit_name_server_2_OBJECTS) : CosNaming.h
-
 EXTRA_DIST = $(idl_DATA)
 
 idldir   = $(datadir)/idl/orbit-2.0
 idl_DATA = CosNaming.idl
 
-BUILT_SOURCES = $(CosNaming_built)
+BUILT_SOURCES = 
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
Index: test/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/test/Makefile.am,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile.am
--- test/Makefile.am	14 Feb 2005 23:21:42 -0000	1.37
+++ test/Makefile.am	7 Aug 2006 10:48:48 -0000
@@ -34,48 +34,49 @@ test_giop_SOURCES =		\
 	test-giop.c		\
 	test-giop-frag.h
 
-TEST_ANY_IDLOUT=test-any.h test-any-common.c test-any-stubs.c test-any-skels.c
-test_any_client_SOURCES=test-any-client.c $(TEST_ANY_IDLOUT)
-test_any_server_SOURCES=test-any-server.c $(TEST_ANY_IDLOUT)
-$(srcdir)/test-any-client.c $(srcdir)/test-any-server.c: test-any.h
-
-ECHO_IDLOUT=echo.h echo-common.c echo-stubs.c echo-skels.c
-echo_client_SOURCES=echo-client.c $(ECHO_IDLOUT)
-echo_client_t_SOURCES=echo-client-t.c $(ECHO_IDLOUT)
-echo_server_SOURCES=echo-server.c echo-srv.c $(ECHO_IDLOUT) echo-share.h$
-$(srcdir)/echo-client-t.c $(srcdir)/echo-client.c $(srcdir)/echo-server.c $(srcdir)/echo-srv.c: echo.h
-
-EMPTY_IDLOUT=empty.h empty-common.c empty-stubs.c empty-skels.c
-empty_client_SOURCES=empty-client.c $(EMPTY_IDLOUT)
-empty_server_SOURCES=empty-server.c $(EMPTY_IDLOUT)
-$(srcdir)/empty-client.c $(srcdir)/empty-server.c: empty.h
-
-IDLOUT=test1-stubs.c test1-skels.c test1-common.c test1.h
-test1_SOURCES=test1.c $(IDLOUT)
-$(srcdir)/test1.c: test1.h
+test_any_client_SOURCES=test-any-client.c $(test_any_idl_IDLOUTFILES)
+test_any_server_SOURCES=test-any-server.c $(test_any_idl_IDLOUTFILES)
 
-test_mem_SOURCES=test-mem.c $(IDLOUT)
+echo_client_SOURCES=echo-client.c $(echo_idl_IDLOUTFILES)
+
+echo_client_t_SOURCES=echo-client-t.c $(echo_idl_IDLOUTFILES)
+
+echo_server_SOURCES=echo-server.c echo-srv.c \
+       $(echo_idl_IDLOUTFILES) \
+       echo-share.h
+
+empty_client_SOURCES=empty-client.c $(empty_idl_IDLOUTFILES)
+empty_server_SOURCES=empty-server.c $(empty_idl_IDLOUTFILES)
+
+test1_SOURCES=test1.c $(test1_idl_IDLOUTFILES)
+
+test_mem_SOURCES=test-mem.c $(test1_idl_IDLOUTFILES)
 
 ior_decode_2_SOURCES=ior-decode.c
 
 typelib_dump_SOURCES=typelib-dump.c
 
-DYNANY_IDLOUT=dynany.h dynany-common.c dynany-skels.c dynany-stubs.c
-test_dynany_SOURCES=$(DYNANY_IDLOUT) test-dynany.c
-test_dynany_LDFLAGS=$(LIBM)
+test_dynany_SOURCES= \
+      $(dynany_idl_IDLOUTFILES) \
+      test-dynany.c
 
 IDL_FLAGS =  --showcpperrors
 IDL_FILES=echo.idl empty.idl test-any.idl test1.idl dynany.idl
-include $(top_srcdir)/Makefile.shared
+echo_idl_IDLCFLAGS = $(IDL_FLAGS)
+echo_idl_IDLOUTFILES = echo.h echo-common.c echo-stubs.c echo-skels.c
+empty_idl_IDLCFLAGS = $(IDL_FLAGS)
+empty_idl_IDLOUTFILES = empty.h empty-common.c empty-stubs.c empty-skels.c
+test_any_idl_IDLCFLAGS = $(IDL_FLAGS)
+test_any_idl_IDLOUTFILES = test-any.h test-any-common.c test-any-stubs.c test-any-skels.c
+test1_idl_IDLCFLAGS = $(IDL_FLAGS)
+test1_idl_IDLOUTFILES = test1-stubs.c test1-skels.c test1-common.c test1.h
+dynany_idl_IDLCFLAGS = $(IDL_FLAGS)
+dynany_idl_IDLOUTFILES = dynany.h dynany-common.c dynany-skels.c dynany-stubs.c
+include $(top_srcdir)/Makefile.idlc
 
-BUILT_SOURCES =            \
-	$(EMPTY_IDLOUT)    \
-	$(ECHO_IDLOUT)     \
-	$(IDLOUT)          \
-	$(TEST_ANY_IDLOUT) \
-	$(DYNANY_IDLOUT)
+BUILT_SOURCES = test1.h echo.h empty.h test-any.h dynany.h
 
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES) $(IDL_CLEAN)
 EXTRA_DIST = $(IDL_FILES)
 
 dist-hook:
Index: test/everything/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/test/everything/Makefile.am,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile.am
--- test/everything/Makefile.am	11 Apr 2005 12:32:40 -0000	1.30
+++ test/everything/Makefile.am	7 Aug 2006 10:48:48 -0000
@@ -37,7 +37,6 @@ LDADD = $(top_builddir)/src/services/imo
 client.c : $(included_src)
 	touch client.c
 client_SOURCES=${EVERYTHING_BUILT} client.c everything.idl constants.h
-client_DEPENDENCIES=${EVERYTHING_BUILT} $(included_src)
 client_LDADD = $(LDADD)
 client_LDFLAGS = -static -module
 
@@ -69,14 +68,14 @@ server_SOURCES=server.c ${EVERYTHING_BUI
 server_LDFLAGS = -static -module
 server.c : $(included_src)
 	touch server.c
-server_DEPENDENCIES=${EVERYTHING_BUILT} $(included_src)
 
-IDL_FLAGS= --showcpperrors --add-imodule
 IDL_FILES= everything.idl
-include $(top_srcdir)/Makefile.shared
+everything_idl_IDLCFLAGS = --showcpperrors --add-imodule
+everything_idl_IDLOUTFILES = $(EVERYTHING_IDLOUT)
+include $(top_srcdir)/Makefile.idlc
 
-BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c
-CLEANFILES = ${BUILT_SOURCES} iorfile
+BUILT_SOURCES = 
+CLEANFILES = ${BUILT_SOURCES} iorfile $(IDL_CLEAN)
 
 TESTS = $(srcdir)/test.sh
 
Index: test/inhibit/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/test/inhibit/Makefile.am,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.am
--- test/inhibit/Makefile.am	30 May 2003 15:55:22 -0000	1.10
+++ test/inhibit/Makefile.am	7 Aug 2006 10:48:48 -0000
@@ -10,19 +10,23 @@ INCLUDES =                           \
 
 LDADD = $(top_builddir)/src/orb/libORBit-2.la $(ORBIT_LIBS)
 
-FOO_IDLOUT=foo.h foo-stubs.c foo-skels.c foo-common.c
-BAA_IDLOUT=baa.h baa-stubs.c baa-skels.c baa-common.c
 
-test_inhibit_SOURCES=$(FOO_IDLOUT) $(BAA_IDLOUT) test-inhibit.c
+test_inhibit_SOURCES= \
+	$(foo_idl_IDLOUTFILES) \
+	$(baa_idl_IDLOUTFILES) \
+	test-inhibit.c
 
-IDL_FLAGS=--showcpperrors -I$(srcdir)
 IDL_FILES=foo.idl baa.idl
-include $(top_srcdir)/Makefile.shared
+foo_idl_IDLOUTFILES=foo.h foo-stubs.c foo-skels.c foo-common.c
+baa_idl_IDLOUTFILES=baa.h baa-stubs.c baa-skels.c baa-common.c
+foo_idl_IDLCFLAGS=--showcpperrors -I$(srcdir)
+baa_idl_IDLCFLAGS=--showcpperrors -I$(srcdir)
+include $(top_srcdir)/Makefile.idlc
 
 TESTS=test-inhibit
 
-BUILT_SOURCES = $(BAA_IDLOUT) $(FOO_IDLOUT)
-CLEANFILES = $(BUILT_SOURCES)
+BUILT_SOURCES = 
+CLEANFILES = $(BUILT_SOURCES) $(IDL_CLEAN)
 EXTRA_DIST = $(IDL_FILES)
 
 dist-hook:
Index: test/poa/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/test/poa/Makefile.am,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile.am
--- test/poa/Makefile.am	19 Jun 2003 20:13:30 -0000	1.15
+++ test/poa/Makefile.am	7 Aug 2006 10:48:48 -0000
@@ -37,14 +37,15 @@ check_PROGRAMS = $(TESTS)
 
 LDADD = $(top_builddir)/src/orb/libORBit-2.la $(ORBIT_LIBS)
 
-POATEST_IDLOUT = poatest.h poatest-common.c poatest-skels.c poatest-stubs.c
 
-IDL_FLAGS=--showcpperrors
 IDL_FILES=poatest.idl
-include $(top_srcdir)/Makefile.shared
+poatest_idl_IDLCFLAGS=--showcpperrors
+poatest_idl_IDLOUTFILES = \
+	poatest.h poatest-common.c poatest-skels.c poatest-stubs.c
+include $(top_srcdir)/Makefile.idlc
 
 common_srcs = 			\
-	$(POATEST_IDLOUT)	\
+	$(poatest_idl_IDLOUTFILES)	\
 	poatest-basic-shell.c	\
 	poatest-basic-shell.h	\
 	poatest-exception.h
@@ -69,8 +70,8 @@ README : $(POA_TESTS_SRCS)
                    intest == 1 && /^ \*/ { print $$2; } ' \
                          $(POA_TESTS_SRCS) > README
 
-BUILT_SOURCES = $(POATEST_IDLOUT)
-CLEANFILES = $(BUILT_SOURCES)
+BUILT_SOURCES = 
+CLEANFILES = $(BUILT_SOURCES) $(IDL_CLEAN)
 EXTRA_DIST = $(IDL_FILES) README
 
 dist-hook:
