0.9.1Release091

2003-08-23  Marco Pesenti Gritti  <marco@gnome.org>

        * configure.in:

        0.9.1

        * src/Makefile.am:

        Do not distribute generated CORBA files

4 files changed, 33 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 1b289ee9a..c43425bdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-08-23  Marco Pesenti Gritti  <marco@gnome.org>
+
+	* configure.in:
+
+	0.9.1
+
+	* src/Makefile.am:
+
+	Do not distribute generated CORBA files
+
 2003-08-22  Marco Pesenti Gritti  <marco@gnome.org>
 
 	* NEWS:
diff --git a/NEWS b/NEWS
index da95c3e13..1dc8f2dc5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,11 @@
 ==============
+Epiphany 0.9.1
+==============
+
+Bugfixes
+	* Do not distribute corba generated files (Marco)
+
+==============
 Epiphany 0.9.0
 ==============
 
diff --git a/configure.in b/configure.in
index a6f618431..afe439808 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(epiphany, 0.9.0,
+AC_INIT(epiphany, 0.9.1,
        [http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany])
 
 EPIPHANY_MAJOR=1.0
diff --git a/src/Makefile.am b/src/Makefile.am
index 29af4c2c8..268d6e34f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,12 +25,18 @@ bin_SCRIPTS = epiphany
 CXXLD = $(CXX)
 LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 
-
-ephy_automation_interface_idl_sources = \
+CORBA_SOURCE = \
 	EphyAutomation-common.c	  \
 	EphyAutomation-stubs.c	  \
 	EphyAutomation-skels.c	  \
-	EphyAutomation.h		
+	EphyAutomation.h
+
+idls = $(top_srcdir)/idl/EphyAutomation.idl
+
+idl_flags = -I$(LIBBONOBO_IDL) -I$(BONOBO_ACTIVATION_IDL) 
+
+$(CORBA_SOURCE): $(idls) $(ORBIT_IDL)
+	$(ORBIT_IDL) $(idl_flags) $(idls)
 
 if ENABLE_NAUTILUS_VIEW
 nautilus_view_sources = \
@@ -73,7 +79,7 @@ INST_H_FILES = 				    		\
 	session.h
 
 epiphany_bin_SOURCES = 				    	\
-	$(ephy_automation_interface_idl_sources) 	\
+	$(CORBA_SOURCE)				 	\
 	$(nautilus_view_sources)			\
 	ephy-automation.c				\
 	ephy-encoding-menu.c				\
@@ -114,14 +120,11 @@ epiphany_bin_LDADD = \
 	$(EPIPHANY_DEPENDENCY_LIBS) \
 	$(INTLLIBS)
 
-CLEANFILES = \
-	$(ephy_automation_interface_idl_sources) \
-	ephy_automation_interface_idl_stamp
-
-$(ephy_automation_interface_idl_sources): ephy_automation_interface_idl_stamp
+BUILT_SOURCES = $(CORBA_SOURCE)
 
-ephy_automation_interface_idl_stamp: $(top_srcdir)/idl/EphyAutomation.idl $(ORBIT_IDL)
-	$(ORBIT_IDL) -I $(LIBBONOBO_IDL) -I $(BONOBO_ACTIVATION_IDL) -I$(top_srcdir) $<
-	touch $@
+CLEANFILES = $(CORBA_SOURCE)
 
 EXTRA_DIST = $(top_srcdir)/idl/EphyAutomation.idl
+
+dist-hook:
+	cd $(distdir); rm -f $(BUILT_SOURCES)