ncurses 5.9 - patch 20140726

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

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 2bf92a3f61589d2e4b79194d9f53c2ee9456cf6b..b69fa81b63c65014be052fe80223b47ab01604f7 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.101 2013/03/13 09:45:11 tom Exp $
+# $Id: Makefile.in,v 1.107 2014/07/26 22:51:31 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2013,2014 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"), #
@@ -47,8 +47,12 @@ DESTDIR              = @DESTDIR@
 srcdir         = @srcdir@
 prefix         = @prefix@
 exec_prefix    = @exec_prefix@
+bindir         = @bindir@
 libdir         = @libdir@
 includedir     = @includedir@
+includesubdir  = @includesubdir@
+
+INCLUDEDIR     = $(DESTDIR)$(includedir)$(includesubdir)
 
 LIBTOOL                = @LIBTOOL_CXX@
 LIBTOOL_CLEAN  = @LIB_CLEAN@
@@ -79,7 +83,7 @@ CXXFLAGS      = @CXXFLAGS@ @EXTRA_CXXFLAGS@
 CXXLIBS                = @CXXLIBS@
 
 INCDIR         = ../include
-CPPFLAGS       = -I../c++ -I$(INCDIR) -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
+CPPFLAGS       = -DHAVE_CONFIG_H @CPPFLAGS@
 
 CTAGS          = @CTAGS@
 ETAGS          = @ETAGS@
@@ -124,20 +128,24 @@ LINK_DEBUG        = $(LINK_FLAGS)
 LINK_PROFILE   = $(LINK_FLAGS)
 LINK_SHARED    = $(LINK_FLAGS)
 
+# flags for test-programs
 TEST_LIBS      = @TEST_LIBS@
 TEST_ARGS      = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
-
-LDFLAGS                = $(TEST_ARGS) @LDFLAGS@ \
+TEST_LDFLAGS   = $(TEST_ARGS) @LDFLAGS@ \
        @LD_MODEL@ $(TEST_LIBS) @LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
 
-LDFLAGS_LIBTOOL        = $(LDFLAGS) $(CFLAGS_LIBTOOL)
-LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
-LDFLAGS_DEBUG  = $(LDFLAGS) $(CFLAGS_DEBUG)
-LDFLAGS_PROFILE        = $(LDFLAGS) $(CFLAGS_PROFILE)
-LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
+LDFLAGS_LIBTOOL        = $(TEST_LDFLAGS) $(CFLAGS_LIBTOOL)
+LDFLAGS_NORMAL = $(TEST_LDFLAGS) $(CFLAGS_NORMAL)
+LDFLAGS_DEBUG  = $(TEST_LDFLAGS) $(CFLAGS_DEBUG)
+LDFLAGS_PROFILE        = $(TEST_LDFLAGS) $(CFLAGS_PROFILE)
+LDFLAGS_SHARED = $(TEST_LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
 
 LDFLAGS_DEFAULT        = $(LINK_@DFT_UPR_MODEL@) $(LDFLAGS_@DFT_UPR_MODEL@)
 
+# flags for library built by this makefile
+LDFLAGS                = $(TEST_ARGS) @LDFLAGS@ \
+       @LD_MODEL@ $(TEST_LIBS) @LIBS@ $(CXXLIBS)
+
 AUTO_SRC       = \
                etip.h
 
@@ -153,22 +161,6 @@ depend :
 tags:
        $(CTAGS) *.[h] *.cc
 
-OBJS_DEMO = $(MODEL)/demo$o
-
-$(MODEL)/demo$o : $(srcdir)/demo.cc \
-       $(cursesf_h) $(cursesm_h) $(cursesapp_h)
-       @echo 'compiling demo (obj_s)'
-       @$(LIBTOOL_COMPILE) $(CXX) $(CFLAGS_DEFAULT) -c $(srcdir)/demo.cc -o $@
-
-demo$x:        $(OBJS_DEMO) \
-       $(LIBRARIES)  \
-       @TEST_DEPS@
-       @ECHO_LD@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
-
-etip.h:        $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
-       cp $(srcdir)/etip.h.in $@
-       sh $(srcdir)/edit_cfg.sh ../include/ncurses_cfg.h $@
-
 $(DESTDIR)$(libdir) :
        mkdir -p $@
 
@@ -188,8 +180,16 @@ 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
+
 cursesw_h      = $(srcdir)/cursesw.h \
-                 etip.h \
+                 $(etip_h) \
                  $(INCDIR)/curses.h
 
 cursesp_h      = $(srcdir)/cursesp.h \
@@ -219,6 +219,27 @@ $(INCDIR)/menu.h :
 $(INCDIR)/panel.h :
        cd ../panel && $(MAKE) $@
 
+###############################################################################
+
+OBJS_DEMO = $(MODEL)/demo$o
+
+$(MODEL)/demo$o : $(srcdir)/demo.cc \
+               $(internal_h) \
+               $(cursesf_h) \
+               $(cursesm_h) \
+               $(cursesapp_h)
+       @echo 'compiling demo (obj_s)'
+       @$(LIBTOOL_COMPILE) $(CXX) $(CFLAGS_DEFAULT) -c $(srcdir)/demo.cc -o $@
+
+demo$x:        $(OBJS_DEMO) \
+       $(LIBRARIES)  \
+       @TEST_DEPS@
+       @ECHO_LD@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
+
+etip.h:        $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
+       cp $(srcdir)/etip.h.in $@
+       sh $(srcdir)/edit_cfg.sh ../include/ncurses_cfg.h $@
+
 ###############################################################################
 # The remainder of this file is automatically generated during configuration
 ###############################################################################