summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaja R Harinath <harinath@src.gnome.org>1998-08-19 16:55:35 +0000
committerRaja R Harinath <harinath@src.gnome.org>1998-08-19 16:55:35 +0000
commitcb62a42de29dfce2390e2dc5fc41095dbc11afe7 (patch)
tree1c8598f7c2002c1170f5defe7ab3ce72aef5b91b
parent55fed73e256d1a4a2d7ae683052039c8cde650bc (diff)
downloadgnome-session-cb62a42de29dfce2390e2dc5fc41095dbc11afe7.tar.gz
Actually compile `control-center' if it is enabled.
* Makefile.am (SUBDIRS): Actually compile `control-center' if it is enabled. (always_built_SUBDIRS): Reinstate `smproxy'.
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog-200202126
-rw-r--r--Makefile.am10
3 files changed, 17 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f979db8b..7aacfc56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-08-19 Raja R Harinath <harinath@cs.umn.edu>
+
+ * Makefile.am (SUBDIRS): Actually compile `control-center' if
+ it is enabled.
+ (always_built_SUBDIRS): Reinstate `smproxy'.
+
1998-08-19 Martin Baulig <martin@home-of-linux.org>
* Makefile.am: Conditionally compiling `control-center' if
diff --git a/ChangeLog-20020212 b/ChangeLog-20020212
index f979db8b..7aacfc56 100644
--- a/ChangeLog-20020212
+++ b/ChangeLog-20020212
@@ -1,3 +1,9 @@
+1998-08-19 Raja R Harinath <harinath@cs.umn.edu>
+
+ * Makefile.am (SUBDIRS): Actually compile `control-center' if
+ it is enabled.
+ (always_built_SUBDIRS): Reinstate `smproxy'.
+
1998-08-19 Martin Baulig <martin@home-of-linux.org>
* Makefile.am: Conditionally compiling `control-center' if
diff --git a/Makefile.am b/Makefile.am
index 65e944ed..4c6a4613 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,15 +7,15 @@ control_center = control-center
endif
always_built_SUBDIRS = panel applets \
- gsm pixmaps desktop-links desktop-properties help-browser \
+ gsm smproxy pixmaps desktop-links desktop-properties help-browser \
gnome-terminal core-docs
-sometimes_built_SUBDIRS = gmenu smproxy control-center
+sometimes_built_SUBDIRS = gmenu control-center
-SUBDIRS = intl po macros $(always_built_SUBDIRS) $(gmenu)
+SUBDIRS = intl po macros $(always_built_SUBDIRS) $(gmenu) $(control_center)
-DIST_SUBDIRS = intl po macros $(always_built_SUBDIRS) \
- $(sometimes_built_SUBDIRS)
+#DIST_SUBDIRS = intl po macros $(always_built_SUBDIRS) \
+# $(sometimes_built_SUBDIRS)
EXTRA_DIST = gnome-core.spec