X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=readline%2Fexamples%2FMakefile.in;h=4a7c39e0a4fb306dd2b1e3f1c10fc080183fd885;hb=cb41b9e70e6fbd1cb603bb9ba4372fbb8ae87b20;hp=5094c6c5254f16894bdce9775f7223292369c0c2;hpb=ca2589f3bbad1e151abbb293d4c43a87b7a4d5ec;p=deliverable%2Fbinutils-gdb.git

diff --git a/readline/examples/Makefile.in b/readline/examples/Makefile.in
index 5094c6c525..4a7c39e0a4 100644
--- a/readline/examples/Makefile.in
+++ b/readline/examples/Makefile.in
@@ -53,8 +53,12 @@ CPPFLAGS = @CPPFLAGS@
 
 INCLUDES = -I$(srcdir) -I$(top_srcdir) -I..
 
-CCFLAGS  = $(DEFS) $(LOCAL_CFLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LDFLAGS = -g -L.. @LDFLAGS@
+CCFLAGS  = $(ASAN_CFLAGS) $(DEFS) $(LOCAL_CFLAGS) $(INCLUDES) $(CPPFLAGS) \
+	$(CFLAGS)
+LDFLAGS = -g -L.. @LDFLAGS@ $(ASAN_LDFLAGS)
+
+ASAN_XCFLAGS = -fsanitize=address -fno-omit-frame-pointer
+ASAN_XLDFLAGS = -fsanitize=address
 
 READLINE_LIB = ../libreadline.a
 HISTORY_LIB = ../libhistory.a
@@ -67,15 +71,18 @@ TERMCAP_LIB = @TERMCAP_LIB@
 
 SOURCES = excallback.c fileman.c histexamp.c manexamp.c rl-fgets.c rl.c \
 		rlbasic.c rlcat.c rlevent.c rlptytest.c rltest.c rlversion.c \
-		rl-callbacktest.c hist_erasedups.c hist_purgecmd.c 
+		rltest2.c rl-callbacktest.c hist_erasedups.c hist_purgecmd.c \
+		rlkeymaps.c
 
 EXECUTABLES = fileman$(EXEEXT) rltest$(EXEEXT) rl$(EXEEXT) rlcat$(EXEEXT) \
 		rlevent$(EXEEXT) rlversion$(EXEEXT) histexamp$(EXEEXT) \
 		rl-callbacktest$(EXEEXT) rlbasic$(EXEEXT) \
-		hist_erasedups$(EXEEXT) hist_purgecmd$(EXEEXT)
+		hist_erasedups$(EXEEXT) hist_purgecmd$(EXEEXT) \
+		rlkeymaps$(EXEEXT)
 
 OBJECTS = fileman.o rltest.o rl.o rlevent.o rlcat.o rlversion.o histexamp.o \
-	  rl-callbacktest.o rlbasic.o hist_erasedups.o hist_purgecmd.o
+	  rltest2.o rl-callbacktest.o rlbasic.o hist_erasedups.o hist_purgecmd.o \
+	  rlkeymaps.o
 
 OTHEREXE = rlptytest$(EXEEXT)
 OTHEROBJ = rlptytest.o
@@ -83,6 +90,9 @@ OTHEROBJ = rlptytest.o
 all: $(EXECUTABLES)
 everything: all
 
+asan:
+	${MAKE} ${MFLAGS} ASAN_CFLAGS='${ASAN_XCFLAGS}' ASAN_LDFLAGS='${ASAN_XLDFLAGS}' all
+
 check:	rlversion$(EXEEXT)
 	@echo Readline version: `rlversion$(EXEEXT)`
 
@@ -113,12 +123,18 @@ rlcat$(EXEEXT): rlcat.o $(READLINE_LIB)
 rlevent$(EXEEXT): rlevent.o $(READLINE_LIB)
 	$(CC) $(LDFLAGS) -o $@ rlevent.o $(READLINE_LIB) $(TERMCAP_LIB)
 
+rlkeymaps$(EXEEXT): rlkeymaps.o $(READLINE_LIB)
+	$(CC) $(LDFLAGS) -o $@ rlkeymaps.o $(READLINE_LIB) $(TERMCAP_LIB)
+
 fileman$(EXEEXT): fileman.o $(READLINE_LIB)
 	$(CC) $(LDFLAGS) -o $@ fileman.o $(READLINE_LIB) $(TERMCAP_LIB)
 
 rltest$(EXEEXT): rltest.o $(READLINE_LIB)
 	$(CC) $(LDFLAGS) -o $@ rltest.o $(READLINE_LIB) $(TERMCAP_LIB)
 
+rltest2$(EXEEXT): rltest2.o $(READLINE_LIB)
+	$(CC) $(LDFLAGS) -o $@ rltest2.o $(READLINE_LIB) $(TERMCAP_LIB)
+
 rl-callbacktest$(EXEEXT): rl-callbacktest.o $(READLINE_LIB)
 	$(CC) $(LDFLAGS) -o $@ rl-callbacktest.o $(READLINE_LIB) $(TERMCAP_LIB)
 
@@ -146,18 +162,21 @@ distclean maintainer-clean: clean
 
 fileman.o: fileman.c
 rltest.o: rltest.c
+rltest2.o: rltest2.c
 rl.o: rl.c
 rlversion.o: rlversion.c
 histexamp.o: histexamp.c
 hist_erasedups.o: hist_erasedups.c
 hist_purgecmd.o: hist_purgecmd.c
 rlbasic.o: rlbasic.c
+rlkeymaps.o: rlkeymaps.c
 rlcat.o: rlcat.c
 rlptytest.o: rlptytest.c
 rl-callbacktest.o: rl-callbacktest.c
 
 fileman.o: $(top_srcdir)/readline.h
 rltest.o: $(top_srcdir)/readline.h
+rltest2.o: $(top_srcdir)/readline.h $(top_srcdir)/history.h
 rl.o: $(top_srcdir)/readline.h
 rlversion.o: $(top_srcdir)/readline.h
 histexamp.o: $(top_srcdir)/history.h