ncurses 6.2 - patch 20200829

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

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 9b22b6ac16ae321af6518ba6a54e51d2087aa4b1..e418d645d1d483ffafd2472af7e31f3930aeb086 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.119 2020/02/02 23:34:34 tom Exp $
+# $Id: Makefile.in,v 1.126 2020/08/29 18:35:49 tom Exp $
 ##############################################################################
 # Copyright 2018,2020 Thomas E. Dickey                                       #
 # Copyright 1998-2015,2016 Free Software Foundation, Inc.                    #
@@ -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@)
@@ -114,7 +114,11 @@ LOCAL_LIBDIR       = @top_builddir@/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++
 
@@ -186,29 +190,36 @@ realclean :: distclean
 
 ###############################################################################
 
-internal_h     = $(srcdir)/internal.h \
-                 $(INCDIR)/ncurses_cfg.h \
-                 $(INCDIR)/nc_mingw.h \
-                 $(INCDIR)/nc_string.h
-
-etip_h         = etip.h \
-                 $(INCDIR)/ncurses_dll.h
+HEADER_DEPS    = \
+       etip.h \
+       ../include/curses.h \
+       ../include/eti.h \
+       ../include/form.h \
+       ../include/menu.h \
+       ../include/ncurses_cfg.h \
+       ../include/ncurses_def.h \
+       ../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 \
+       $(srcdir)/internal.h
 
 cursesw_h      = $(srcdir)/cursesw.h \
-                 $(etip_h) \
-                 $(INCDIR)/curses.h
+                 $(HEADER_DEPS)
 
 cursesp_h      = $(srcdir)/cursesp.h \
-                 $(cursesw_h) \
-                 $(INCDIR)/panel.h
+                 $(cursesw_h)
 
 cursesf_h      = $(srcdir)/cursesf.h \
-                 $(cursesp_h) \
-                 $(INCDIR)/form.h
+                 $(cursesp_h)
 
 cursesm_h      = $(srcdir)/cursesm.h \
-                 $(cursesp_h) \
-                 $(INCDIR)/menu.h
+                 $(cursesp_h)
 
 cursslk_h      = $(srcdir)/cursslk.h \
                  $(cursesw_h)
@@ -230,12 +241,12 @@ $(INCDIR)/panel.h :
 OBJS_DEMO = $(MODEL)/demo$o
 
 $(MODEL)/demo$o : $(srcdir)/demo.cc \
-               $(internal_h) \
+               $(HEADER_DEPS) \
                $(cursesf_h) \
                $(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)  \