diff options
Diffstat (limited to 'contrib/ncurses/panel')
| -rw-r--r-- | contrib/ncurses/panel/Makefile.in | 17 | ||||
| -rw-r--r-- | contrib/ncurses/panel/panel.priv.h | 12 |
2 files changed, 13 insertions, 16 deletions
diff --git a/contrib/ncurses/panel/Makefile.in b/contrib/ncurses/panel/Makefile.in index 6780007e31bd..c3592526d548 100644 --- a/contrib/ncurses/panel/Makefile.in +++ b/contrib/ncurses/panel/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.36 2001/03/24 19:53:31 tom Exp $ +# $Id: Makefile.in,v 1.41 2002/01/20 00:41:18 tom Exp $ ############################################################################## -# Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc. # +# Copyright (c) 1998,1999,2000,2001,2002 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -50,6 +50,7 @@ DESTDIR = @DESTDIR@ srcdir = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ +bindir = @bindir@ libdir = @libdir@ includedir = @includedir@ datadir = @datadir@ @@ -58,6 +59,7 @@ LIBTOOL = @LIBTOOL@ INSTALL = @INSTALL@ INSTALL_LIB = @INSTALL@ @INSTALL_LIB@ +INSTALL_PROG = @INSTALL_PROG@ INSTALL_DATA = @INSTALL_DATA@ AR = @AR@ @@ -70,7 +72,7 @@ CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ \ +CPPFLAGS = @CPPFLAGS@ -I@top_srcdir@/ncurses \ -DHAVE_CONFIG_H CCFLAGS = $(CPPFLAGS) $(CFLAGS) @@ -86,7 +88,7 @@ CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) LINK = $(LIBTOOL) $(CC) LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ -SHLIB_DIRS = -L../lib -L$(libdir) +SHLIB_DIRS = -L../lib SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ MK_SHARED_LIB = @MK_SHARED_LIB@ @@ -98,6 +100,8 @@ ABI_VERSION = @cf_cv_abi_version@ RANLIB = @RANLIB@ +IMPORT_LIB = @IMPORT_LIB@ +SHARED_LIB = @SHARED_LIB@ LIBRARIES = @LIBS_TO_MAKE@ LINT = @LINT@ @@ -114,8 +118,9 @@ install :: $(AUTO_SRC) $(LIBRARIES) sources: $(AUTO_SRC) +$(DESTDIR)$(bindir) \ $(DESTDIR)$(libdir) : - $(srcdir)/../mkinstalldirs $@ + sh $(srcdir)/../mkinstalldirs $@ # make a copy to simplify include-paths while still keeping panel's include # file in this directory. @@ -134,7 +139,7 @@ tags: @MAKE_UPPER_TAGS@ etags *.[ch] mostlyclean :: - -rm -f core tags TAGS *~ *.i *.ln *.atac trace + -rm -f core tags TAGS *~ *.bak *.i *.ln *.atac trace clean :: mostlyclean -rm -f $(AUTO_SRC) diff --git a/contrib/ncurses/panel/panel.priv.h b/contrib/ncurses/panel/panel.priv.h index d029b1212c83..7097d8423cf5 100644 --- a/contrib/ncurses/panel/panel.priv.h +++ b/contrib/ncurses/panel/panel.priv.h @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ -/* $Id: panel.priv.h,v 1.18 2001/03/24 21:38:45 tom Exp $ */ +/* $Id: panel.priv.h,v 1.19 2001/06/02 23:31:05 tom Exp $ */ #ifndef NCURSES_PANEL_PRIV_H #define NCURSES_PANEL_PRIV_H 1 @@ -47,6 +47,7 @@ # include <dbmalloc.h> /* Conor Cahill's library */ #endif +#include "curses.priv.h" #include "panel.h" #include <nc_panel.h> @@ -101,15 +102,6 @@ #define Is_Top(p) (((p)!=(PANEL*)0) && !EMPTY_STACK() && (_nc_top_panel==(p))) #define Is_Pseudo(p) ((p) && ((p)==_nc_bottom_panel)) -/* borrowed from curses.priv.h */ -#define CHANGED_RANGE(line,start,end) \ - if (line->firstchar == _NOCHANGE \ - || line->firstchar > (start)) \ - line->firstchar = start; \ - if (line->lastchar == _NOCHANGE \ - || line->lastchar < (end)) \ - line->lastchar = end - /*+------------------------------------------------------------------------- IS_LINKED(pan) - check to see if panel is in the stack --------------------------------------------------------------------------*/ |