summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoronestone <onestone>2006-12-19 22:45:53 +0000
committeronestone <onestone>2006-12-19 22:45:53 +0000
commit001936bbd135079215729dbc639ee559cd9654df (patch)
tree4bd1e8a93429b70e6e3e1a6f1b9decee66e15086
parent3689ec52b05d47a499a633e59d533cae5edcb5e8 (diff)
downloadaquamarine-001936bbd135079215729dbc639ee559cd9654df.tar.gz
aquamarine-001936bbd135079215729dbc639ee559cd9654df.tar.bz2
aquamarine: fixed build without berylsettings
-rw-r--r--kcm/Makefile.am9
-rw-r--r--settings-backend/Makefile.am4
2 files changed, 11 insertions, 2 deletions
diff --git a/kcm/Makefile.am b/kcm/Makefile.am
index 69bb3a6..5b7113b 100644
--- a/kcm/Makefile.am
+++ b/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/settings-backend/Makefile.am b/settings-backend/Makefile.am
index fc4002d..85e89b4 100644
--- a/settings-backend/Makefile.am
+++ b/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