Update of /cvsroot/winbash/winbash
In directory usw-pr-cvs1:/tmp/cvs-serv10202
Modified Files:
Makefile
Log Message:
use new readline 4.2 library. there is probably a better way to
do this...
Index: Makefile
===================================================================
RCS file: /cvsroot/winbash/winbash/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile 20 Mar 2002 02:09:54 -0000 1.10
+++ Makefile 25 Mar 2002 10:57:00 -0000 1.11
@@ -18,17 +18,16 @@
DEFS += -DHAVE_STRCHR -DSHELL
DEFS += -DMSDOS -DHAVE_ALLOCA -DHAVE_ALLOCA_H
DEFS += -D__NT_VC__ -DCONIO -DOPENDIR_NOT_ROBUST
+DEFS += -DREADLINE_LIBRARY
CPPFLAGS += -I.
CPPFLAGS += -I./lib
CPPFLAGS += -I./dum_inc
CPPFLAGS += $(DEFS)
-CFLAGS = -MT -W2
-
+CFLAGS = -MT -W2
Machine=i386
LDFLAGS += -nologo -incremental:no -subsystem:console -machine:IX86
-
ifdef RELEASE
CFLAGS += -O2
else
@@ -39,7 +38,6 @@
VPATH := .
VPATH := $(VPATH):./dum_inc
-VPATH := $(VPATH):./lib/readline
VPATH := $(VPATH):./lib/glob
%.obj: %.c
@@ -105,22 +103,6 @@
lib/glob/fnmatch.c \
lib/glob/glob.c
-LIB_READLINE_SRCS = \
- lib/readline/bind.c \
- lib/readline/complete.c \
- lib/readline/display.c \
- lib/readline/funmap.c \
- lib/readline/history.c \
- lib/readline/isearch.c \
- lib/readline/keymaps.c \
- lib/readline/parens.c \
- lib/readline/readline.c \
- lib/readline/rltty.c \
- lib/readline/search.c \
- lib/readline/signals.c \
- lib/readline/tilde.c \
- lib/readline/vi_mode.c
-
WINBASH_SRCS = \
y.tab.c \
alias.c \
@@ -164,14 +146,14 @@
$(WINBASH_SRCS)
# used for builing tags
-CSOURCES = $(BASH-SRCS)
+CSOURCES = $(BASH-SRCS) $(wildcard lib/readline/*.c)
# FIXME -- this could be a little more specific.
HSOURCES = $(wildcard *.h lib/readline/*.h builtins/*.h dum_inc/*.h)
BASH-OBJS = $(BASH-SRCS:%.c=%.obj)
-LDLIBS += builtins/builtins.lib
-LDLIBS += user32.lib
+LDLIBS += builtins/builtins.lib lib/readline/readline.lib
+LDLIBS += user32.lib Advapi32.lib
LDLIBS += Mpr.lib Winmm.lib
#--------------------------------------------------------------------------
# Define all your symbols before here
@@ -185,13 +167,16 @@
sh.exe : bash.exe
cp $^ $@
-bash.exe : builtins/builtins.lib $(BASH-OBJS)
+bash.exe : builtins/builtins.lib lib/readline/readline.lib $(BASH-OBJS)
link.exe $(LDFLAGS) -out:$@ $^ $(LDLIBS)
builtins/builtins.lib: $(BUILTIN_SRCS)
cd builtins ; $(MAKE)
+lib/readline/readline.lib:
+ cd lib/readline ; $(MAKE)
+
newversion.exe: newversion.c
$(CC) $(CPPFLAGS) $(CPPDEFS) $(CFLAGS) -o $@ $<
@@ -200,6 +185,7 @@
newversion.obj newversion.exe newversion.pdb newversion.ilk \
TAGS
cd builtins ; $(MAKE) clean
+ cd lib/readline ; $(MAKE) clean
.distribution:
./newversion.exe -dir $(srcdir) -dist `./bash.exe -c 'echo $$BASH_VERSION'`
|
