ncurses 5.9 - patch 20130928

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

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 04a7bf8c2d2098962cabf13ea262acf8a1bd930a..72ad0eb006155d26783d518c287a629ba9c25a33 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.103 2013/03/30 21:03:33 tom Exp $
+# $Id: Makefile.in,v 1.106 2013/08/04 20:20:45 tom Exp $
 ##############################################################################
 # Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -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@
@@ -157,25 +161,6 @@ depend :
 tags:
        $(CTAGS) *.[h] *.cc
 
-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 $@
-
 $(DESTDIR)$(libdir) :
        mkdir -p $@
 
@@ -234,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
 ###############################################################################