ncurses 6.2 - patch 20210123

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

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 4425f263d808f5bfaa16c92139b6f8ed60be24e3..c1c0db703cf83a1a2b5d85bee080a9362904e699 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.121 2020/02/22 17:29:13 tom Exp $
+# $Id: Makefile.in,v 1.128 2021/01/23 20:42:08 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    #
 # 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
 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@
 
 CTAGS          = @CTAGS@
 ETAGS          = @ETAGS@


@@ -98,9 +98,9 @@ CC            = ${CXX}
 CCFLAGS                = $(CPPFLAGS) $(CXXFLAGS)
 
 CFLAGS_LIBTOOL = $(CCFLAGS)
 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@)
 CFLAGS_SHARED  = $(CCFLAGS) @CC_SHARED_OPTS@
 
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)


@@ -114,7 +114,11 @@ LOCAL_LIBDIR       = @top_builddir@/lib
 
 LINK           = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
 SHLIB_DIRS     = -L../lib
 
 LINK           = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
 SHLIB_DIRS     = -L../lib

-SHLIB_LIST     = $(SHLIB_DIRS) -lform@USE_LIB_SUFFIX@ -lmenu@USE_LIB_SUFFIX@ -lpanel@USE_LIB_SUFFIX@ -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST     = $(SHLIB_DIRS) \
+               -l@FORM_NAME@@USE_LIB_SUFFIX@ \
+               -l@MENU_NAME@@USE_LIB_SUFFIX@ \
+               -l@PANEL_NAME@@USE_LIB_SUFFIX@ \
+               -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@

 
 LIBROOT                = ncurses++
 
 
 LIBROOT                = ncurses++
 


@@ -186,7 +190,7 @@ realclean :: distclean
 
 ###############################################################################
 
 
 ###############################################################################
 

-HEADER_DEPS    = \
+HEADER_DEPS    = @INTERNALS_HDR@ \

        etip.h \
        ../include/curses.h \
        ../include/eti.h \
        etip.h \
        ../include/curses.h \
        ../include/eti.h \


@@ -197,7 +201,6 @@ HEADER_DEPS = \
        ../include/ncurses_dll.h \
        ../include/panel.h \
        ../include/unctrl.h \
        ../include/ncurses_dll.h \
        ../include/panel.h \
        ../include/unctrl.h \

-       $(INCDIR)/nc_mingw.h \

        $(INCDIR)/nc_string.h \
        $(srcdir)/cursesp.h \
        $(srcdir)/cursesw.h \
        $(INCDIR)/nc_string.h \
        $(srcdir)/cursesp.h \
        $(srcdir)/cursesw.h \


@@ -223,13 +226,13 @@ cursesapp_h       = $(srcdir)/cursesapp.h \
                  $(cursslk_h)
 
 $(INCDIR)/form.h :
                  $(cursslk_h)
 
 $(INCDIR)/form.h :

-       cd ../form && $(MAKE) $@
+       ( cd ../form && $(MAKE) $@ )

 
 $(INCDIR)/menu.h :
 
 $(INCDIR)/menu.h :

-       cd ../menu && $(MAKE) $@
+       ( cd ../menu && $(MAKE) $@ )

 
 $(INCDIR)/panel.h :
 
 $(INCDIR)/panel.h :

-       cd ../panel && $(MAKE) $@
+       ( cd ../panel && $(MAKE) $@ )

 
 ###############################################################################
 
 
 ###############################################################################
 


@@ -241,7 +244,7 @@ $(MODEL)/demo$o : $(srcdir)/demo.cc \
                $(cursesm_h) \
                $(cursesapp_h)
        @echo 'compiling demo (obj_s)'
                $(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)  \
 
 demo$x:        $(OBJS_DEMO) \
        $(LIBRARIES)  \