[Xfce4-commits] r25508 - in squeeze/trunk: . icons/scalable src

[Stephan Arts]

Author: stephan
Date: 2007-04-10 11:08:58 +0000 (Tue, 10 Apr 2007)
New Revision: 25508

Modified:
   squeeze/trunk/Makefile.am
   squeeze/trunk/configure.in.in
   squeeze/trunk/icons/scalable/Makefile.am
   squeeze/trunk/src/Makefile.am
Log:
fix make distcheck

Modified: squeeze/trunk/Makefile.am
===================================================================
--- squeeze/trunk/Makefile.am	2007-04-10 10:59:13 UTC (rev 25507)
+++ squeeze/trunk/Makefile.am	2007-04-10 11:08:58 UTC (rev 25508)
@@ -1,12 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS =							\
-	1.8								\
-	dist-bzip2
-
 SUBDIRS = pixmaps libsqueeze po docs src icons
 
-wrapperdir = $(libexecdir)/thunar-archive-plugin/
+wrapperdir = $(libexecdir)/thunar-archive-plugin
 wrapper_SCRIPTS = squeeze.tap
 
 desktopdir = $(datadir)/applications
@@ -15,7 +11,6 @@
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = \
-	icons \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
@@ -30,4 +25,7 @@
 	intltool-update \
 	$(desktop_DATA)
 
+DISTCHECK_CONFIGURE_FLAGS =						\
+	--enable-gtk-doc
+
 ACLOCAL_AMFLAGS = -I m4

Modified: squeeze/trunk/configure.in.in
===================================================================
--- squeeze/trunk/configure.in.in	2007-04-10 10:59:13 UTC (rev 25507)
+++ squeeze/trunk/configure.in.in	2007-04-10 11:08:58 UTC (rev 25508)
@@ -33,7 +33,7 @@
 AC_PREREQ([2.50])
 
 SQUEEZE_VERSION=squeeze_version
-AM_INIT_AUTOMAKE([squeeze], [$SQUEEZE_VERSION])
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE
 

Modified: squeeze/trunk/icons/scalable/Makefile.am
===================================================================
--- squeeze/trunk/icons/scalable/Makefile.am	2007-04-10 10:59:13 UTC (rev 25507)
+++ squeeze/trunk/icons/scalable/Makefile.am	2007-04-10 11:08:58 UTC (rev 25508)
@@ -6,6 +6,8 @@
 
 iconsdir = $(datadir)/icons/hicolor/scalable/apps
 icons_DATA = squeeze.svg
+
+EXTRA_DIST = $(icons_DATA)
 	
 
 # EXTRA_DIST = $(appicons_DATA)

Modified: squeeze/trunk/src/Makefile.am
===================================================================
--- squeeze/trunk/src/Makefile.am	2007-04-10 10:59:13 UTC (rev 25507)
+++ squeeze/trunk/src/Makefile.am	2007-04-10 11:08:58 UTC (rev 25508)
@@ -55,11 +55,15 @@
 INCLUDES = \
 	-I${top_srcdir}
 
+if MAINTAINER_MODE
+
 DISTCLEANFILES = \
 	throbber-fallback.c
 
-#BUILT_SOURCES = \
-#	throbber-fallback.c
+BUILT_SOURCES = \
+	throbber-fallback.c
 
 throbber-fallback.c: $(srcdir)/throbber-fallback.png Makefile
 	(echo "#include \"throbber-fallback.h\"" && gdk-pixbuf-csource --extern --raw --stream --name=sq_throbber_fallback $(srcdir)/throbber-fallback.png) > throbber-fallback.c
+
+endif