ncurses 6.2 - patch 20210417

[ncurses.git] / c++ / Makefile.in

diff --git a/c++/Makefile.in b/c++/Makefile.in
index e418d645d1d483ffafd2472af7e31f3930aeb086..a4f39e2ef65d11085aa616fa5ec58256aff04868 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.126 2020/08/29 18:35:49 tom Exp $
+# $Id: Makefile.in,v 1.129 2021/03/20 10:14:27 tom Exp $
 ##############################################################################
-# Copyright 2018,2020 Thomas E. Dickey                                       #
+# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
 # Copyright 1998-2015,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -128,6 +128,10 @@ LIBNAME            = @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@
 
 LIBRARIES      = @Libs_To_Make@
 
+LINT           = @LINT@
+LINT_OPTS      = @LINT_OPTS@
+LINT_LIBS      = -lncurses @LIBS@
+
 LINK_FLAGS     = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@USE_LIB_SUFFIX@
 RPATH_LIST     = @RPATH_LIST@
 MK_SHARED_LIB  = @MK_SHARED_LIB@
@@ -190,7 +194,7 @@ realclean :: distclean
 
 ###############################################################################
 
-HEADER_DEPS    = \
+HEADER_DEPS    = @INTERNALS_HDR@ \
        etip.h \
        ../include/curses.h \
        ../include/eti.h \
@@ -201,9 +205,7 @@ HEADER_DEPS = \
        ../include/ncurses_dll.h \
        ../include/panel.h \
        ../include/unctrl.h \
-       $(INCDIR)/nc_mingw.h \
        $(INCDIR)/nc_string.h \
-       $(INCDIR)/nc_win32.h \
        $(srcdir)/cursesp.h \
        $(srcdir)/cursesw.h \
        $(srcdir)/cursslk.h \
@@ -228,13 +230,13 @@ cursesapp_h       = $(srcdir)/cursesapp.h \
                  $(cursslk_h)
 
 $(INCDIR)/form.h :
-       cd ../form && $(MAKE) $@
+       ( cd ../form && $(MAKE) $@ )
 
 $(INCDIR)/menu.h :
-       cd ../menu && $(MAKE) $@
+       ( cd ../menu && $(MAKE) $@ )
 
 $(INCDIR)/panel.h :
-       cd ../panel && $(MAKE) $@
+       ( cd ../panel && $(MAKE) $@ )
 
 ###############################################################################
 
@@ -246,7 +248,7 @@ $(MODEL)/demo$o : $(srcdir)/demo.cc \
                $(cursesm_h) \
                $(cursesapp_h)
        @echo 'compiling demo (obj_s)'
-       @cd $(MODEL) && $(LIBTOOL_COMPILE) $(CXX) $(CFLAGS_DEFAULT) -c $(top_srcdir)/c++/demo.cc -o $@
+       @( cd $(MODEL) && $(LIBTOOL_COMPILE) $(CXX) $(CFLAGS_DEFAULT) -c $(top_srcdir)/c++/demo.cc -o $@ )
 
 demo$x:        $(OBJS_DEMO) \
        $(LIBRARIES)  \