From cb62a42de29dfce2390e2dc5fc41095dbc11afe7 Mon Sep 17 00:00:00 2001 From: Raja R Harinath Date: Wed, 19 Aug 1998 16:55:35 +0000 Subject: Actually compile `control-center' if it is enabled. * Makefile.am (SUBDIRS): Actually compile `control-center' if it is enabled. (always_built_SUBDIRS): Reinstate `smproxy'. --- ChangeLog | 6 ++++++ ChangeLog-20020212 | 6 ++++++ Makefile.am | 10 +++++----- 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 + + * Makefile.am (SUBDIRS): Actually compile `control-center' if + it is enabled. + (always_built_SUBDIRS): Reinstate `smproxy'. + 1998-08-19 Martin Baulig * 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 + + * Makefile.am (SUBDIRS): Actually compile `control-center' if + it is enabled. + (always_built_SUBDIRS): Reinstate `smproxy'. + 1998-08-19 Martin Baulig * 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 -- cgit v1.2.1