X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Makefile.glibc;h=2535e9f3b8e7160a8b7856beda9aebf815945a34;hp=0767871bc7811d46667641af75ba440c4dc85ed5;hb=46722468f47c2b77b3987729b4bcf2321cccfd01;hpb=3a9b6a3bf0269231bef7de74757a910dedd04e0c

diff --git a/Makefile.glibc b/Makefile.glibc
index 0767871b..2535e9f3 100644
--- a/Makefile.glibc
+++ b/Makefile.glibc
@@ -1,4 +1,4 @@
-# Copyright (C) 1997 Free Software Foundation, Inc.
+# Copyright (C) 1997,1998 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
 #
 subdir	:= ncurses
 
-ncurses-version	= 4.1
+ncurses-version	= 4.2
 form-version	= $(ncurses-version)
 menu-version	= $(ncurses-version)
 panel-version	= $(ncurses-version)
@@ -38,51 +38,242 @@ subdir-dirs = $(extras) progs test
 vpath %.c $(subdir-dirs)
 vpath %.h $(subdir-dirs)
 
-libform-routines	= fld_def fld_stat fld_type fld_user \
-				frm_adabind frm_data frm_def \
-				frm_driver frm_hook frm_opts \
-				frm_req_name frm_user frm_win \
-				fty_alnum fty_alpha fty_enum fty_int \
-				fty_ipv4 fty_num fty_regex
-
-libncurses-routines	= alloc_entry captoinfo comp_error comp_hash \
-				comp_parse comp_scan hardscroll \
-				hashmap lib_acs lib_adabind lib_addch \
-				lib_addstr lib_baudrate \
-				lib_beep lib_bkgd lib_box lib_clear \
-				lib_clrbot lib_clreol lib_color \
-				lib_data lib_delch lib_delwin \
-				lib_dft_fgbg lib_doupdate lib_endwin \
-				lib_erase lib_freeall lib_getch \
-				lib_getstr lib_inchstr lib_initscr \
-				lib_insch lib_insdel lib_insstr \
-				lib_instr lib_isendwin lib_kernel \
-				lib_longname lib_mouse lib_move \
-				lib_mvcur lib_mvwin lib_newterm \
-				lib_newwin lib_options lib_overlay \
-				lib_pad lib_print lib_printw lib_raw \
-				lib_refresh lib_restart lib_scanw \
-				lib_screen lib_scroll lib_scrreg \
-				lib_set_term lib_setup lib_slk \
-				lib_termcap lib_ti lib_touch \
-				lib_tparm lib_tputs lib_trace \
-				lib_traceatr lib_tracechr \
-				lib_tracedmp lib_tracemse lib_tstp \
-				lib_twait lib_vidattr \
-				lib_window names parse_entry \
-				read_entry read_termcap resizeterm \
-				wresize write_entry \
-				codes comp_captab expanded fallback \
-				lib_gen names lib_keyname unctrl
-
-libmenu-routines	= m_adabind m_attribs m_cursor m_driver \
-				m_format m_global m_hook m_item_cur \
-				m_item_nam m_item_new m_item_opt \
-				m_item_use m_item_val m_item_vis \
-				m_items m_new m_opts m_post \
-				m_req_name m_spacing m_userptr m_win
-
-libpanel-routines	= panel
+libform-routines	= \
+			fld_arg \
+			fld_attr \
+			fld_current \
+			fld_def \
+			fld_dup \
+			fld_ftchoice \
+			fld_ftlink \
+			fld_info \
+			fld_just \
+			fld_link \
+			fld_max \
+			fld_move \
+			fld_newftyp \
+			fld_opts \
+			fld_pad \
+			fld_page \
+			fld_stat \
+			fld_type \
+			fld_user \
+			frm_cursor \
+			frm_data \
+			frm_def \
+			frm_driver \
+			frm_hook \
+			frm_opts \
+			frm_page \
+			frm_post \
+			frm_req_name \
+			frm_scale \
+			frm_sub \
+			frm_user \
+			frm_win \
+			fty_alnum \
+			fty_alpha \
+			fty_enum \
+			fty_int \
+			fty_ipv4 \
+			fty_num \
+			fty_regex
+
+libncurses-routines	= \
+			base/define_key \
+			base/keybound \
+			base/keyok \
+			base/lib_addch \
+			base/lib_addstr \
+			base/lib_beep \
+			base/lib_bkgd \
+			base/lib_box \
+			base/lib_chgat \
+			base/lib_clear \
+			base/lib_clearok \
+			base/lib_clrbot \
+			base/lib_clreol \
+			base/lib_color \
+			base/lib_colorset \
+			base/lib_delch \
+			base/lib_delwin \
+			base/lib_dft_fgbg \
+			base/lib_echo \
+			base/lib_endwin \
+			base/lib_erase \
+			base/lib_flash \
+			base/lib_freeall \
+			base/lib_getch \
+			base/lib_getstr \
+			base/lib_hline \
+			base/lib_immedok \
+			base/lib_inchstr \
+			base/lib_initscr \
+			base/lib_insch \
+			base/lib_insdel \
+			base/lib_insstr \
+			base/lib_instr \
+			base/lib_isendwin \
+			base/lib_leaveok \
+			base/lib_mouse \
+			base/lib_move \
+			base/lib_mvwin \
+			base/lib_newterm \
+			base/lib_newwin \
+			base/lib_nl \
+			base/lib_overlay \
+			base/lib_pad \
+			base/lib_printw \
+			base/lib_redrawln \
+			base/lib_refresh \
+			base/lib_restart \
+			base/lib_scanw \
+			base/lib_screen \
+			base/lib_scroll \
+			base/lib_scrollok \
+			base/lib_scrreg \
+			base/lib_set_term \
+			base/lib_slk \
+			base/lib_slkatr_set \
+			base/lib_slkatrof \
+			base/lib_slkatron \
+			base/lib_slkatrset \
+			base/lib_slkattr \
+			base/lib_slkclear \
+			base/lib_slkcolor \
+			base/lib_slkinit \
+			base/lib_slklab \
+			base/lib_slkrefr \
+			base/lib_slkset \
+			base/lib_slktouch \
+			base/lib_touch \
+			base/lib_ungetch \
+			base/lib_vline \
+			base/lib_wattroff \
+			base/lib_wattron \
+			base/lib_winch \
+			base/lib_window \
+			base/memmove \
+			base/nc_panel \
+			base/resizeterm \
+			base/safe_sprintf \
+			base/sigaction \
+			base/tries \
+			base/version \
+			base/vsscanf \
+			base/wresize \
+			codes \
+			comp_captab \
+			expanded \
+			fallback \
+			lib_gen \
+			lib_keyname \
+			names \
+			tinfo/access \
+			tinfo/add_tries \
+			tinfo/alloc_entry \
+			tinfo/alloc_ttype \
+			tinfo/captoinfo \
+			tinfo/comp_error \
+			tinfo/comp_expand \
+			tinfo/comp_hash \
+			tinfo/comp_parse \
+			tinfo/comp_scan \
+			tinfo/doalloc \
+			tinfo/free_ttype \
+			tinfo/getenv_num \
+			tinfo/home_terminfo \
+			tinfo/init_keytry \
+			tinfo/lib_acs \
+			tinfo/lib_baudrate \
+			tinfo/lib_cur_term \
+			tinfo/lib_data \
+			tinfo/lib_has_cap \
+			tinfo/lib_kernel \
+			tinfo/lib_longname \
+			tinfo/lib_napms \
+			tinfo/lib_options \
+			tinfo/lib_print \
+			tinfo/lib_raw \
+			tinfo/lib_setup \
+			tinfo/lib_termcap \
+			tinfo/lib_termname \
+			tinfo/lib_tgoto \
+			tinfo/lib_ti \
+			tinfo/lib_tparm \
+			tinfo/lib_tputs \
+			tinfo/lib_ttyflags \
+			tinfo/name_match \
+			tinfo/parse_entry \
+			tinfo/read_entry \
+			tinfo/read_termcap \
+			tinfo/setbuf \
+			tinfo/strings \
+			tinfo/write_entry \
+			trace/lib_trace \
+			trace/lib_traceatr \
+			trace/lib_tracebits \
+			trace/lib_tracechr \
+			trace/lib_tracedmp \
+			trace/lib_tracemse \
+			trace/trace_buf \
+			trace/trace_tries \
+			trace/trace_xnames \
+			trace/varargs \
+			trace/visbuf \
+			tty/hardscroll \
+			tty/hashmap \
+			tty/lib_mvcur \
+			tty/lib_tstp \
+			tty/lib_twait \
+			tty/lib_vidattr \
+			tty/tty_update \
+			unctrl
+
+libmenu-routines	= \
+			m_attribs \
+			m_cursor \
+			m_driver \
+			m_format \
+			m_global \
+			m_hook \
+			m_item_cur \
+			m_item_nam \
+			m_item_new \
+			m_item_opt \
+			m_item_top \
+			m_item_use \
+			m_item_val \
+			m_item_vis \
+			m_items \
+			m_new \
+			m_opts \
+			m_pad \
+			m_pattern \
+			m_post \
+			m_req_name \
+			m_scale \
+			m_spacing \
+			m_sub \
+			m_userptr \
+			m_win
+
+libpanel-routines	= \
+			panel \
+			p_above \
+			p_below \
+			p_bottom \
+			p_delete \
+			p_hide \
+			p_hidden \
+			p_move \
+			p_new \
+			p_replace \
+			p_show \
+			p_top \
+			p_update \
+			p_user \
+			p_win
 
 headers = curses.h eti.h form.h menu.h panel.h term.h termcap.h \
 	  unctrl.h
@@ -98,14 +289,9 @@ tset-objs = tset.o dump_entry.o
 extra-objs = $(tic-objs) $(toe-objs) $(infocmp-objs) $(clear-objs) \
 		$(tput-objs) $(tset-objs)
 
-# mvcur won't compile
-test-srcs = tctest thardscroll thashmap \
-		blue bs firework gdc hanoi hashtest knight lrtest \
-		ncurses newdemo rain tclock testcurs view worm xmas
-mvcur-objs = mvcur.o dump_entry.o
-tctest-objs = tctest.o
-thardscroll-objs = thardscroll.o
-thashmap-objs = thashmap.o hhardscroll.o
+test-srcs = blue bs cardfile ditto firework firstlast gdc hanoi hashtest knight \
+		lrtest ncurses newdemo rain tclock testaddch testcurs \
+		testscanw view worm xmas
 
 include ../Rules
 
@@ -131,28 +317,16 @@ ifndef inst_mandir
 inst_mandir		= $(install_root)/$(mandir)
 endif
 
-CPPFLAGS += -DTERMINFO='"$(terminfodir)"' -Iinclude -Incurses \
-	-Imenu -Iprogs -Itest -I$(objpfx)
+CPPFLAGS += -DTERMINFO='"$(terminfodir)"' -Iinclude -Iform -Incurses \
+	-Imenu -Ipanel -Iprogs -Itest
 
-$(objpfx)mvcur.o: ncurses/lib_mvcur.c
-	$(CC) -c -o $@ $(CFLAGS) $(CPPFLAGS) -DTRACE -DMAIN $?
-
-$(objpfx)tctest.o: ncurses/captoinfo.c
-	$(CC) -c -o $@ $(CFLAGS) $(CPPFLAGS) -DTRACE -DMAIN $?
-
-$(objpfx)thardscroll.o: ncurses/hardscroll.c
-	$(CC) -c -o $@ $(CFLAGS) $(CPPFLAGS) -DTRACE -DSCROLLDEBUG $?
-
-$(objpfx)thashmap.o: ncurses/hashmap.c
-	$(CC) -c -o $@ $(CFLAGS) $(CPPFLAGS) -DTRACE -DHASHDEBUG $?
+ifneq ($(strip $(objpfx)),)
+CPPFLAGS += -I$(objpfx)
+endif
 
-$(objpfx)hhardscroll.o: ncurses/hardscroll.c
-	$(CC) -c -o $@ $(CFLAGS) $(CPPFLAGS) -DTRACE -DHASHDEBUG $?
+LDLIBS-tclock = math/libm
 
-$(objpfx)mvcur: $(addprefix $(objpfx),$(mvcur-objs))
-$(objpfx)tctest: $(addprefix $(objpfx),$(tctest-objs))
-$(objpfx)thardscroll: $(addprefix $(objpfx),$(thardscroll-objs))
-$(objpfx)thashmap: $(addprefix $(objpfx),$(thashmap-objs))
+tests: $(test-srcs:%=$(objpfx)%)
 
 $(objpfx)clear: $(addprefix $(objpfx),$(clear-objs))
 $(objpfx)infocmp: $(addprefix $(objpfx),$(infocmp-objs))
@@ -175,12 +349,19 @@ $(test-srcs:%=$(objpfx)%): $(objpfx)libform.a $(objpfx)libmenu.a \
 # a statically-linked program that hasn't already loaded it.
 $(extras:%=$(objpfx)lib%.so): $(common-objpfx)libc.so
 
-subdir_install: $(inst_libdir)/libtermcap.a $(inst_libdir)/libcurses.a
+subdir_install: $(inst_libdir)/libtermcap.a $(inst_libdir)/libcurses.a \
+	$(inst_bindir)/reset $(inst_bindir)/captoinfo
 
 $(inst_libdir)/libtermcap.a $(inst_libdir)/libcurses.a: \
 		$(inst_libdir)/libncurses.a
 	$(make-link)
 
+$(inst_bindir)/reset: $(inst_bindir)/tset
+	$(make-link)
+
+$(inst_bindir)/captoinfo: $(inst_bindir)/tic
+	$(make-link)
+
 ifeq (yes,$(build-shared))
 subdir_install: $(inst_libdir)/libtermcap.so  $(inst_libdir)/libcurses.so
 
@@ -204,7 +385,7 @@ $(inst_tabsetdir)/std: \
 	  echo installing $$f; \
 	  $(INSTALL_DATA) $$f $(inst_tabsetdir); \
 	done
-	
+
 
 ifeq (no,$(cross-compiling))
 subdir_install: $(inst_terminfodir)/v/vt100