ncurses 6.2 - patch 20210418

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

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 4444aa6f94eda02f850cee68a7cf36d53a151412..bd7fcb1c8474675bba249c70aae4e5d8647d0f02 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.122 2020/03/08 16:13:11 tom Exp $
+# $Id: Makefile.in,v 1.130 2021/04/18 15:13:58 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    #
@@ -89,7 +89,7 @@ CXXFLAGS      = @CXXFLAGS@ @EXTRA_CXXFLAGS@
 CXXLIBS                = @CXXLIBS@
 
 INCDIR         = ../include
-CPPFLAGS       = -DHAVE_CONFIG_H -I../c++ @CPPFLAGS@
+CPPFLAGS       = -DHAVE_CONFIG_H -DBUILDING_NCURSES_CXX -I../c++ @CPPFLAGS@
 
 CTAGS          = @CTAGS@
 ETAGS          = @ETAGS@
@@ -98,9 +98,9 @@ CC            = ${CXX}
 CCFLAGS                = $(CPPFLAGS) $(CXXFLAGS)
 
 CFLAGS_LIBTOOL = $(CCFLAGS)
-CFLAGS_NORMAL  = $(CCFLAGS)
-CFLAGS_DEBUG   = $(CCFLAGS) @CXX_G_OPT@ -DTRACE
-CFLAGS_PROFILE = $(CCFLAGS) -pg
+CFLAGS_NORMAL  = $(CCFLAGS) -DNCURSES_STATIC
+CFLAGS_DEBUG   = $(CCFLAGS) -DNCURSES_STATIC @CXX_G_OPT@ -DTRACE
+CFLAGS_PROFILE = $(CCFLAGS) -DNCURSES_STATIC -pg
 CFLAGS_SHARED  = $(CCFLAGS) @CC_SHARED_OPTS@
 
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
@@ -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,7 +205,6 @@ HEADER_DEPS = \
        ../include/ncurses_dll.h \
        ../include/panel.h \
        ../include/unctrl.h \
-       $(INCDIR)/nc_mingw.h \
        $(INCDIR)/nc_string.h \
        $(srcdir)/cursesp.h \
        $(srcdir)/cursesw.h \
@@ -227,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) $@ )
 
 ###############################################################################
 
@@ -245,7 +248,7 @@ $(MODEL)/demo$o : $(srcdir)/demo.cc \
                $(cursesm_h) \
                $(cursesapp_h)
        @echo 'compiling demo (obj_s)'
-       @$(LIBTOOL_COMPILE) $(CXX) $(CFLAGS_DEFAULT) -c $(srcdir)/demo.cc -o $@
+       @( cd $(MODEL) && $(LIBTOOL_COMPILE) $(CXX) $(CFLAGS_DEFAULT) -c $(top_srcdir)/c++/demo.cc -o $@ )
 
 demo$x:        $(OBJS_DEMO) \
        $(LIBRARIES)  \
@@ -256,6 +259,18 @@ etip.h:    $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
        cp $(srcdir)/etip.h.in $@
        $(SHELL) $(srcdir)/edit_cfg.sh ../include/ncurses_cfg.h $@
 
+# Verify that each header-file can be compiled without including another.
+check::
+       @$(SHELL) -c "for header in *.h;\
+               do \
+                       [ \$${header} = etip.h ] && continue; \
+                       echo \"** testing \$${header}\" ; \
+                       echo \"#include <\$${header}>\" >headers.cc; \
+                       echo \"int main(int argc, char **argv) { (void) argc; (void) argv; return 0; }\" >>headers.cc; \
+                       $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) headers.cc; \
+               done"
+       -@rm -f headers.*
+
 ###############################################################################
 # The remainder of this file is automatically generated during configuration
 ###############################################################################