summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Baulig <martin@home-of-linux.org>1998-08-19 12:38:23 +0000
committerMartin Baulig <martin@src.gnome.org>1998-08-19 12:38:23 +0000
commit3d34adddd4b4b7f6b988574aff9ee28e26ddf19b (patch)
treebbf7e1ed278c5878bc8591b7cab61c4d3acd5617
parent0e514c8f775712b52316998dbf4447af131b87b1 (diff)
downloadgnome-control-center-3d34adddd4b4b7f6b988574aff9ee28e26ddf19b.tar.gz
Conditionally compiling `control-center' if we have ORBit.
1998-08-19 Martin Baulig <martin@home-of-linux.org> * Makefile.am: Conditionally compiling `control-center' if we have ORBit.
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.am8
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e4c218b8..f979db8b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1998-08-19 Martin Baulig <martin@home-of-linux.org>
+ * Makefile.am: Conditionally compiling `control-center' if
+ we have ORBit.
+
* Makefile.am: Using $(always_built_SUBDIRS),
$(sometimes_built_SUBDIRS) and correct $(DIST_SUBDIRS).
diff --git a/Makefile.am b/Makefile.am
index a54146aac..6c901f3b1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,15 @@ if PROGRAM_GMENU
gmenu = gmenu
endif
+if ORBIT_INSTALLED
+control_center = control-center
+endif
+
always_built_SUBDIRS = panel applets \
gsm pixmaps desktop-links desktop-properties help-browser \
- gnome-terminal core-docs control-center
+ gnome-terminal core-docs
-sometimes_built_SUBDIRS = gmenu smproxy
+sometimes_built_SUBDIRS = gmenu smproxy control_center
SUBDIRS = intl po macros $(always_built_SUBDIRS) $(gmenu)