summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoramaranth <amaranth@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-11-12 15:56:38 +0000
committeramaranth <amaranth@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-11-12 15:56:38 +0000
commita69d5b7b2cb593e3ae688df07ca642c3cf768b0b (patch)
treebe0a3378b677a5367c0e4b0d60a39e3a8b7e5809
parent6f843026c05f1960047a9959d42943d0cdb047f9 (diff)
downloadmarex-dev-a69d5b7b2cb593e3ae688df07ca642c3cf768b0b.tar.gz
marex-dev-a69d5b7b2cb593e3ae688df07ca642c3cf768b0b.tar.bz2
clean up heliodor control file, make 'make debs' build heliodor, depend
on automake 1.9 in all build systems git-svn-id: file:///beryl/trunk@1155 d7aaf104-2d23-0410-ae22-9d23157bf5a3
-rw-r--r--Makefile7
-rw-r--r--beryl-core/configure.ac2
-rw-r--r--beryl-dbus/configure.ac2
-rw-r--r--beryl-manager/configure.ac2
-rw-r--r--beryl-plugins/configure.ac2
-rw-r--r--beryl-settings/configure.ac2
-rw-r--r--distro-specific-build-files/heliodor/debian/control4
-rw-r--r--emerald-themes/configure.ac2
-rw-r--r--emerald/configure.ac2
-rw-r--r--heliodor/configure.ac2
10 files changed, 13 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index a2b133f..f14d473 100644
--- a/Makefile
+++ b/Makefile
@@ -50,13 +50,14 @@ REDIRECT=2>&1 | tee -a $(TRUNKDIR)/$*.log
endif
modules:=\
- beryl-core \
+ beryl-core \
beryl-dbus \
beryl-plugins \
beryl-settings \
beryl-manager \
- emerald \
- emerald-themes
+ emerald \
+ emerald-themes \
+ heliodor
cfgmodules:=$(patsubst %,$(COOKIEDIR)/%.cfg,$(modules))
buildmodules:=$(patsubst %,$(COOKIEDIR)/%.built,$(modules))
diff --git a/beryl-core/configure.ac b/beryl-core/configure.ac
index 528b4ee..f8fd1e4 100644
--- a/beryl-core/configure.ac
+++ b/beryl-core/configure.ac
@@ -6,7 +6,7 @@ AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
#AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 dist-bzip2])
AC_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
diff --git a/beryl-dbus/configure.ac b/beryl-dbus/configure.ac
index d6b1398..c1c0124 100644
--- a/beryl-dbus/configure.ac
+++ b/beryl-dbus/configure.ac
@@ -7,7 +7,7 @@ AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 dist-bzip2])
AC_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
diff --git a/beryl-manager/configure.ac b/beryl-manager/configure.ac
index 5181ca1..8f8ea7a 100644
--- a/beryl-manager/configure.ac
+++ b/beryl-manager/configure.ac
@@ -6,7 +6,7 @@ AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
#AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 dist-bzip2])
AC_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
diff --git a/beryl-plugins/configure.ac b/beryl-plugins/configure.ac
index 79bacfa..88df805 100644
--- a/beryl-plugins/configure.ac
+++ b/beryl-plugins/configure.ac
@@ -6,7 +6,7 @@ AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
#AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 dist-bzip2])
AC_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
diff --git a/beryl-settings/configure.ac b/beryl-settings/configure.ac
index e01cf0d..0e35f88 100644
--- a/beryl-settings/configure.ac
+++ b/beryl-settings/configure.ac
@@ -6,7 +6,7 @@ AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
#AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 dist-bzip2])
AC_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
diff --git a/distro-specific-build-files/heliodor/debian/control b/distro-specific-build-files/heliodor/debian/control
index 3e773bf..9ca65d3 100644
--- a/distro-specific-build-files/heliodor/debian/control
+++ b/distro-specific-build-files/heliodor/debian/control
@@ -2,9 +2,7 @@ Source: heliodor
Section: x11
Priority: optional
Maintainer: Jason Smith <JasSmith@gmail.com>
-Build-Depends: debhelper (>= 5), cdbs, autotools-dev, pkg-config, beryl-dev,
- libgtk2.0-dev (>= 2.8.0), libxrender-dev, libwnck-dev, libpango1.0-dev, libgconf2.0-dev,
- libmetacity-dev (>= 2.15.21)
+Build-Depends: debhelper (>= 5), cdbs, autotools-dev, pkg-config, beryl-dev, libgtk2.0-dev (>= 2.8.0), libxrender-dev, libwnck-dev, libpango1.0-dev, libgconf2-dev, libmetacity-dev (>= 2.15.21), libgnomeui-dev, libgnome-desktop-dev
Standards-Version: 3.7.2
Package: heliodor
diff --git a/emerald-themes/configure.ac b/emerald-themes/configure.ac
index e378eba..446ce53 100644
--- a/emerald-themes/configure.ac
+++ b/emerald-themes/configure.ac
@@ -7,7 +7,7 @@ AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 dist-bzip2])
AC_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
diff --git a/emerald/configure.ac b/emerald/configure.ac
index c6e2d70..fd202de 100644
--- a/emerald/configure.ac
+++ b/emerald/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([emerald],esyscmd(. ./VERSION;echo -n $VERSION), [livinglatexkali@gmail.
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 dist-bzip2])
AC_CONFIG_HEADER([config.h])
AC_ISC_POSIX
diff --git a/heliodor/configure.ac b/heliodor/configure.ac
index e7e3192..3047b91 100644
--- a/heliodor/configure.ac
+++ b/heliodor/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([heliodor],esyscmd(. ./VERSION;echo -n $VERSION), [livinglatexkali@gmail
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 dist-bzip2])
AC_CONFIG_HEADER([config.h])
AC_ISC_POSIX