balsa r8104 - in trunk: . src

[PeterB svn gnome org]

Author: PeterB
Date: Thu Mar 19 21:59:41 2009
New Revision: 8104
URL: http://svn.gnome.org/viewvc/balsa?rev=8104&view=rev

Log:
install BonoboActivation files only if !BUILD_WITH_UNIQUE

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Thu Mar 19 21:59:41 2009
@@ -13,52 +13,42 @@
 desktop_DATA = balsa.desktop
 @INTLTOOL_DESKTOP_RULE@
 
-if BUILD_WITH_G_D_U
-EXTRA_DIST = \
-	balsa.1.in \
-	balsa.spec.in \
-	balsa.desktop.in \
-	intltool-extract.in	\
-	intltool-merge.in	\
-	intltool-update.in	\
-	gnome-balsa2.png \
-	bootstrap.sh	\
-	mkinstalldirs	\
-	HACKING			\
-	docs/mh-mail-HOWTO	\
-	docs/vconvert.awk	\
-	docs/pine2vcard		\
-	GNOME_Balsa.server.in	\
-	balsa-mail.lang		\
-	balsa-mail-style.xml	\
-	gnome-doc-utils.make
-
-else
-EXTRA_DIST = \
-	balsa.1.in \
-	balsa.spec.in \
-	balsa.desktop.in \
+balsa_extra_dist =		\
+	balsa.1.in		\
+	balsa.spec.in		\
+	balsa.desktop.in	\
 	intltool-extract.in	\
 	intltool-merge.in	\
 	intltool-update.in	\
-	gnome-balsa2.png \
-	bootstrap.sh	\
-	mkinstalldirs	\
+	gnome-balsa2.png	\
+	bootstrap.sh		\
+	mkinstalldirs		\
 	HACKING			\
 	docs/mh-mail-HOWTO	\
 	docs/vconvert.awk	\
 	docs/pine2vcard		\
-	GNOME_Balsa.server.in	\
 	balsa-mail.lang		\
 	balsa-mail-style.xml
+
+if BUILD_WITH_G_D_U
+balsa_g_d_u_extra_dist = gnome-doc-utils.make
 endif
-DISTCLEANFILES = $(desktop_DATA) $(server_DATA) \
-	intltool-extract intltool-merge intltool-update	\
-	gnome-doc-utils.make
 
-serverdir       = $(libdir)/bonobo/servers
-server_in_files = GNOME_Balsa.server
-server_DATA     = $(server_in_files:.server.in=.server)
+if !BUILD_WITH_UNIQUE
+balsa_server_extra_dist = GNOME_Balsa.server.in
+serverdir               = $(libdir)/bonobo/servers
+server_in_files         = GNOME_Balsa.server
+server_DATA             = $(server_in_files:.server.in=.server)
+
+$(server_in_files): $(server_in_files).in
+	sed -e "s|\ bindir\@|$(bindir)|" $< > $@
+
+endif
+
+EXTRA_DIST =			\
+    $(balsa_extra_dist)		\
+    $(balsa_g_d_u_extra_dist)	\
+    $(balsa_server_extra_dist)
 
 if BUILD_WITH_GTKSOURCEVIEW2
 gtksourceviewdir = $(BALSA_DATA_PREFIX)/gtksourceview-2.0
@@ -66,8 +56,9 @@
 	balsa-mail-style.xml
 endif
 
-$(server_in_files): $(server_in_files).in
-	sed -e "s|\ bindir\@|$(bindir)|" $< > $@
+DISTCLEANFILES = $(desktop_DATA) $(server_DATA) \
+	intltool-extract intltool-merge intltool-update	\
+	gnome-doc-utils.make
 
 
 dist-hook: balsa.spec

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Mar 19 21:59:41 2009
@@ -117,19 +117,11 @@
 endif
 
 if BUILD_WITH_UNIQUE
-balsa_bonobo_extra_dist = \
-	balsa-bonobo.c    \
-	balsa-bonobo.h
-balsa_bonobo_extra =
-balsa_IDL_SRCLIST =
-balsa_IDL_OBJS    =
-BUILT_SOURCES =
+balsa_bonobo_extra_dist = balsa-bonobo.c balsa-bonobo.h
 else
 if BUILD_WITH_GNOME
-balsa_bonobo_extra =      \
-	balsa-bonobo.c    \
-	balsa-bonobo.h
-balsa_bonobo_extra_dist =
+balsa_bonobo_extra = balsa-bonobo.c balsa-bonobo.h
+balsa_bonobo_extra_dist = Balsa.idl
 balsa_IDL_SRCLIST = Balsa-common.c Balsa-skels.c Balsa-stubs.c Balsa.h
 balsa_IDL_OBJS    = Balsa-common.o Balsa-skels.o Balsa-stubs.o
 # see http://sources.redhat.com/automake/dependencies.html
@@ -138,11 +130,9 @@
 #auto* *SHOULD* figure this out *grr*
 $(srcdir)/balsa-bonobo.c: Balsa.h
 
+idldir = $(datadir)/idl
+idl_DATA = Balsa.idl
 
-else
-balsa_IDL_SRCLIST = 
-balsa_IDL_OBJS    = 
-BUILT_SOURCES = 
 endif
 endif
 
@@ -156,14 +146,10 @@
 DISTCLEANFILES = $(balsa_IDL_SRCLIST)
 
 EXTRA_DIST =			\
-	Balsa.idl		\
 	$(balsa_gtkspell_extra_dist) \
 	$(balsa_bonobo_extra_dist)   \
 	$(balsa_print_extra_dist)
 
-idldir = $(datadir)/idl
-idl_DATA = Balsa.idl
-
 AM_CPPFLAGS = \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	-I$(top_builddir) -I$(top_srcdir) \