summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoronestone <onestone@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-12-19 22:45:53 +0000
committeronestone <onestone@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-12-19 22:45:53 +0000
commitf0e285c66048ce31834fcc0ff2b477a037332387 (patch)
treebdf58c4764afd79bca079cac7ebc87d4445f5022
parentfb3a41f4aa32b7df3757514ac00d166184b3e430 (diff)
downloadmarex-dev-f0e285c66048ce31834fcc0ff2b477a037332387.tar.gz
marex-dev-f0e285c66048ce31834fcc0ff2b477a037332387.tar.bz2
aquamarine: fixed build without berylsettings
git-svn-id: file:///beryl/trunk@1920 d7aaf104-2d23-0410-ae22-9d23157bf5a3
-rw-r--r--aquamarine/kcm/Makefile.am9
-rw-r--r--aquamarine/settings-backend/Makefile.am4
2 files changed, 11 insertions, 2 deletions
diff --git a/aquamarine/kcm/Makefile.am b/aquamarine/kcm/Makefile.am
index 69bb3a6..5b7113b 100644
--- a/aquamarine/kcm/Makefile.am
+++ b/aquamarine/kcm/Makefile.am
@@ -9,8 +9,13 @@ kcm_beryl_la_SOURCES = main.cpp \
KDE_CXXFLAGS = $(BERYLSETTINGS_CFLAGS)
-kde_module_LTLIBRARIES = kcm_beryl.la
-
METASOURCES = AUTO
+
+if with_berylsettings
+
+kde_module_LTLIBRARIES = kcm_beryl.la
+
xdg_apps_DATA = beryl.desktop
+
+endif \ No newline at end of file
diff --git a/aquamarine/settings-backend/Makefile.am b/aquamarine/settings-backend/Makefile.am
index fc4002d..85e89b4 100644
--- a/aquamarine/settings-backend/Makefile.am
+++ b/aquamarine/settings-backend/Makefile.am
@@ -1,3 +1,5 @@
+if with_berylsettings
+
INCLUDES = -I$(srcdir)/lib $(all_includes)
libkconfig_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
@@ -7,3 +9,5 @@ backenddir = $(plugindir)/backends
KDE_CXXFLAGS = $(BERYLSETTINGS_CFLAGS)
backend_LTLIBRARIES = libkconfig.la
+
+endif \ No newline at end of file