ncurses 5.9 - patch 20140726

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

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 04a7bf8c2d2098962cabf13ea262acf8a1bd930a..b69fa81b63c65014be052fe80223b47ab01604f7 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.103 2013/03/30 21:03:33 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"), #
 #                                                                            #
 # 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@
 srcdir         = @srcdir@
 prefix         = @prefix@
 exec_prefix    = @exec_prefix@

+bindir         = @bindir@

 libdir         = @libdir@
 includedir     = @includedir@
 libdir         = @libdir@
 includedir     = @includedir@

+includesubdir  = @includesubdir@
+
+INCLUDEDIR     = $(DESTDIR)$(includedir)$(includesubdir)

 
 LIBTOOL                = @LIBTOOL_CXX@
 LIBTOOL_CLEAN  = @LIB_CLEAN@
 
 LIBTOOL                = @LIBTOOL_CXX@
 LIBTOOL_CLEAN  = @LIB_CLEAN@


@@ -79,7 +83,7 @@ CXXFLAGS      = @CXXFLAGS@ @EXTRA_CXXFLAGS@
 CXXLIBS                = @CXXLIBS@
 
 INCDIR         = ../include
 CXXLIBS                = @CXXLIBS@
 
 INCDIR         = ../include

-CPPFLAGS       = -I../c++ -I$(INCDIR) -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
+CPPFLAGS       = -DHAVE_CONFIG_H @CPPFLAGS@

 
 CTAGS          = @CTAGS@
 ETAGS          = @ETAGS@
 
 CTAGS          = @CTAGS@
 ETAGS          = @ETAGS@


@@ -157,25 +161,6 @@ depend :
 tags:
        $(CTAGS) *.[h] *.cc
 
 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 $@
 
 $(DESTDIR)$(libdir) :
        mkdir -p $@
 


@@ -234,6 +219,27 @@ $(INCDIR)/menu.h :
 $(INCDIR)/panel.h :
        cd ../panel && $(MAKE) $@
 
 $(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
 ###############################################################################
 ###############################################################################
 # The remainder of this file is automatically generated during configuration
 ###############################################################################