r1735 - in trunk

[stsp at dslinux.in-berlin.de]

Author: stsp
Date: 2007-04-18 14:58:07 +0200 (Wed, 18 Apr 2007)
New Revision: 1735

Log:
Get rid of CONFIG_LIB_GPM_FORCE. Having two flags that do the same
thing is stupid. Also, this way it's clear which flag to check
for in Makefiles for apps that support gpm (e.g. user/mc).


Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in	2007-04-16 22:18:20 UTC (rev 1734)
+++ trunk/config/config.in	2007-04-18 12:58:07 UTC (rev 1735)
@@ -82,7 +82,7 @@
 
 comment 'Force build (Normally built when required)'
 bool 'Build flex'		CONFIG_LIB_FLEX_FORCE
-bool 'Build gpm'		CONFIG_LIB_GPM_FORCE
+bool 'Build gpm'		CONFIG_LIB_GPM
 bool 'Build libAES'		CONFIG_LIB_LIBAES_FORCE
 bool 'Build libDES'		CONFIG_LIB_LIBDES_FORCE
 bool 'Build libSSL'		CONFIG_LIB_LIBSSL_FORCE
@@ -784,7 +784,7 @@
 bool 'gdbreplay (old)'		CONFIG_USER_GDBSERVER_GDBREPLAY
 bool 'gdbserver (old)'		CONFIG_USER_GDBSERVER_GDBSERVER
 # gpm provides both a lib and an app so it lives in lib/
-bool 'gpm'			CONFIG_LIB_GPM_FORCE
+bool 'gpm'			CONFIG_LIB_GPM
 bool 'grep'			CONFIG_USER_GREP_GREP
 bool 'hd'			CONFIG_USER_HD_HD
 bool 'hexedit'			CONFIG_USER_HEXEDIT_HEXEDIT

Modified: trunk/lib/Makefile
===================================================================
--- trunk/lib/Makefile	2007-04-16 22:18:20 UTC (rev 1734)
+++ trunk/lib/Makefile	2007-04-18 12:58:07 UTC (rev 1735)
@@ -37,7 +37,6 @@
 dir_$(CONFIG_LIB_FLEX)         += flex
 dir_$(CONFIG_LIB_FLEX_FORCE)   += flex
 dir_$(CONFIG_LIB_GPM)          += gpm
-dir_$(CONFIG_LIB_GPM_FORCE)    += gpm
 dir_$(CONFIG_LIB_LIBAES)       += libaes
 dir_$(CONFIG_LIB_LIBAES_FORCE) += libaes
 dir_$(CONFIG_LIB_LIBDES)       += libdes