r1734 - in trunk
stsp at dslinux.in-berlin.de
stsp at dslinux.in-berlin.de
Tue Apr 17 00:18:26 CEST 2007
Author: stsp
Date: 2007-04-17 00:18:20 +0200 (Tue, 17 Apr 2007)
New Revision: 1734
Log:
Move gpm from user/ to lib/ to make sure it is compiled
earlier than apps that link to libgpm.a.
Modified: trunk/config/Configure.help
===================================================================
--- trunk/config/Configure.help 2007-04-15 21:01:06 UTC (rev 1733)
+++ trunk/config/Configure.help 2007-04-16 22:18:20 UTC (rev 1734)
@@ -482,9 +482,11 @@
server. (old version - mk68k targets only)
Approx. binary size: 14k
-CONFIG_USER_GPM_GPM
- The General Purpose Mouse daemon.
- With this daemon you can use the mouse on the DSLinux console.
+CONFIG_LIB_GPM_FORCE
+ The General Purpose Mouse daemon and library.
+ With the daemon you can use the mouse on the DSLinux console.
+ Apps like Links and Midnight Commander use the library to talk
+ to the daemon.
CONFIG_USER_GREP_GREP
GNU grep, egrep and fgrep
Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in 2007-04-15 21:01:06 UTC (rev 1733)
+++ trunk/config/config.in 2007-04-16 22:18:20 UTC (rev 1734)
@@ -82,6 +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 libAES' CONFIG_LIB_LIBAES_FORCE
bool 'Build libDES' CONFIG_LIB_LIBDES_FORCE
bool 'Build libSSL' CONFIG_LIB_LIBSSL_FORCE
@@ -450,7 +451,7 @@
define_bool CONFIG_LIB_LIBSSL y
bool ' links with mouse' CONFIG_USER_LINKS_WITH_GPM
if [ "$CONFIG_USER_LINKS_WITH_GPM" = "y" ]; then
- define_bool CONFIG_USER_GPM_GPM y
+ define_bool CONFIG_LIB_GPM y
fi
bool ' links with graphics' CONFIG_USER_LINKS_WITH_GRAPHICS
if [ "$CONFIG_USER_LINKS_WITH_GRAPHICS" = "y" ]; then
@@ -782,7 +783,8 @@
bool 'gdbserver' CONFIG_USER_GDB_GDBSERVER
bool 'gdbreplay (old)' CONFIG_USER_GDBSERVER_GDBREPLAY
bool 'gdbserver (old)' CONFIG_USER_GDBSERVER_GDBSERVER
-bool 'gpm' CONFIG_USER_GPM_GPM
+# gpm provides both a lib and an app so it lives in lib/
+bool 'gpm' CONFIG_LIB_GPM_FORCE
bool 'grep' CONFIG_USER_GREP_GREP
bool 'hd' CONFIG_USER_HD_HD
bool 'hexedit' CONFIG_USER_HEXEDIT_HEXEDIT
@@ -1611,6 +1613,9 @@
bool 'Cleopatra VGA' CONFIG_USER_MICROWIN_CLEOVGA
comment 'Mouse/Touch Screen'
bool 'GPM Mouse' CONFIG_USER_MICROWIN_GPMMOUSE
+ if [ "$CONFIG_USER_MICROWIN_GPMMOUSE" = "y" ]; then
+ define_bool CONFIG_LIB_GPM y
+ fi
bool 'Serial Mouse' CONFIG_USER_MICROWIN_SERMOUSE
bool 'TP Mouse' CONFIG_USER_MICROWIN_TPMOUSE
bool 'TP Helio' CONFIG_USER_MICROWIN_TPHELIO
Modified: trunk/include/Makefile
===================================================================
--- trunk/include/Makefile 2007-04-15 21:01:06 UTC (rev 1733)
+++ trunk/include/Makefile 2007-04-16 22:18:20 UTC (rev 1734)
@@ -60,7 +60,7 @@
$(ROOTDIR)/prop/smgrd/unixware/cmd/sscep/sscep_error_codes.h,. \
$(ROOTDIR)/lib/libid3tag/id3tag.h,. \
$(ROOTDIR)/lib/libmad/mad.h,. \
- $(ROOTDIR)/user/gpm/src/headers/gpm.h,.
+ $(ROOTDIR)/lib/gpm/src/headers/gpm.h,.
#
Modified: trunk/lib/Makefile
===================================================================
--- trunk/lib/Makefile 2007-04-15 21:01:06 UTC (rev 1733)
+++ trunk/lib/Makefile 2007-04-16 22:18:20 UTC (rev 1734)
@@ -36,6 +36,8 @@
#
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
@@ -174,7 +176,7 @@
$(ROOTDIR)/lib/libgmp/*.a \
$(ROOTDIR)/lib/libid3tag/*.a \
$(ROOTDIR)/lib/libmad/*.a \
- $(ROOTDIR)/user/gpm/src/lib/*.a
+ $(ROOTDIR)/lib/gpm/src/lib/*.a
##############################################################################
Copied: trunk/lib/gpm (from rev 1731, trunk/user/gpm)
Modified: trunk/lib/gpm/Makefile
===================================================================
--- trunk/user/gpm/Makefile 2007-04-15 20:39:40 UTC (rev 1731)
+++ trunk/lib/gpm/Makefile 2007-04-16 22:18:20 UTC (rev 1734)
@@ -8,8 +8,8 @@
#
SHELL = /bin/sh
-srcdir = $(ROOTDIR)/user/gpm
-top_srcdir = $(ROOTDIR)/user/gpm
+srcdir = $(ROOTDIR)/lib/gpm
+top_srcdir = $(ROOTDIR)/lib/gpm
top_builddir = .
include Makefile.include
Modified: trunk/lib/gpm/src/Makefile
===================================================================
--- trunk/user/gpm/src/Makefile 2007-04-15 20:39:40 UTC (rev 1731)
+++ trunk/lib/gpm/src/Makefile 2007-04-16 22:18:20 UTC (rev 1734)
@@ -7,7 +7,7 @@
# Copyright (C) 2001,2002 Nico Schottelius <nico at schottelius.org>
#
-srcdir = $(ROOTDIR)/user/gpm/src
+srcdir = $(ROOTDIR)/lib/gpm/src
top_builddir = ..
include $(top_builddir)/Makefile.include
Modified: trunk/user/Makefile
===================================================================
--- trunk/user/Makefile 2007-04-15 21:01:06 UTC (rev 1733)
+++ trunk/user/Makefile 2007-04-16 22:18:20 UTC (rev 1734)
@@ -147,7 +147,6 @@
dir_$(CONFIG_USER_GDB_GDBREPLAY) += gdb
dir_$(CONFIG_USER_GDB_GDBSERVER) += gdb
dir_$(CONFIG_USER_GETTYD_GETTYD) += gettyd
-dir_$(CONFIG_USER_GPM_GPM) += gpm
dir_$(CONFIG_USER_GREP_GREP) += grep
dir_$(CONFIG_USER_HD_HD) += hd
dir_$(CONFIG_USER_HOSTAP_HOSTAP) += hostap
More information about the dslinux-commit
mailing list