ncurses 5.9 - patch 20140726

[ncurses.git] / ncurses / Makefile.in

diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index 79f4ebcf14581d48246b87138338e4e5c9cbeed0..c9c8b1695afb598e103884291d1d0db77216ea64 100644 (file)
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.135 2012/10/06 18:58:03 tom Exp $
+# $Id: Makefile.in,v 1.141 2014/07/26 23:16:55 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2011,2012 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"), #
@@ -66,6 +66,9 @@ libdir                = @libdir@
 includedir     = @includedir@
 datarootdir    = @datarootdir@
 datadir                = @datadir@
+includesubdir  = @includesubdir@
+
+INCLUDEDIR     = $(DESTDIR)$(includedir)$(includesubdir)
 
 LIBTOOL                = @LIBTOOL@
 LIBTOOL_CLEAN  = @LIB_CLEAN@
@@ -85,6 +88,7 @@ ARFLAGS               = @ARFLAGS@
 AWK            = @AWK@
 LD             = @LD@
 LN_S           = @LN_S@
+NM             = @NM@
 
 CTAGS          = @CTAGS@
 ETAGS          = @ETAGS@
@@ -94,13 +98,13 @@ CPP         = @CPP@
 CFLAGS         = @CFLAGS@
 
 INCDIR         = $(srcdir)/../include
-CPPFLAGS       = -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) @CPPFLAGS@
+CPPFLAGS       = -DHAVE_CONFIG_H @CPPFLAGS@
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 
-BUILD_CPPFLAGS = -I../include -DUSE_BUILD_CC @BUILD_CPPFLAGS@
+BUILD_CPPFLAGS = -DHAVE_CONFIG_H -DUSE_BUILD_CC -I../ncurses -I$(srcdir) -I../include -I$(INCDIR) @BUILD_CPPFLAGS@ 
 BUILD_CC       = @BUILD_CC@
-BUILD_CCFLAGS  = -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) -I$(INCDIR) $(BUILD_CPPFLAGS) @BUILD_CFLAGS@
+BUILD_CCFLAGS  = @BUILD_CFLAGS@
 BUILD_LDFLAGS  = @BUILD_LDFLAGS@
 BUILD_LIBS     = @BUILD_LIBS@
 
@@ -221,12 +225,12 @@ keys.list :       $(tinfo)/MKkeys_list.sh
 make_keys$(BUILD_EXEEXT) : \
                $(tinfo)/make_keys.c \
                names.c
-       $(BUILD_CC) -o $@ $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
+       $(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
 
 make_hash$(BUILD_EXEEXT) : \
                $(tinfo)/make_hash.c \
                ../include/hashsize.h
-       $(BUILD_CC) -o $@ $(BUILD_CCFLAGS) $(tinfo)/make_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
+       $(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(tinfo)/make_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
 
 ./expanded.c : $(srcdir)/curses.priv.h $(serial)/MKexpanded.sh
        sh -e $(serial)/MKexpanded.sh "$(CPP)" $(CPPFLAGS) > $@
@@ -256,6 +260,9 @@ tags:
 @MAKE_UPPER_TAGS@TAGS:
 @MAKE_UPPER_TAGS@      $(ETAGS) *.[ch] */*.[ch]
 
+ncurses.map : $(LIBRARIES)
+       $(NM) -p $(LIBRARIES) >$@
+
 mostlyclean ::
        -rm -f core tags TAGS *~ *.bak *.i *.ln *.atac trace
        -rm -f $(TEST_PROGS)
@@ -264,7 +271,7 @@ clean :: mostlyclean
        -rm -f $(AUTO_SRC)
        -rm -f make_keys$(BUILD_EXEEXT)
        -rm -f make_hash$(BUILD_EXEEXT)
-       -rm -rf .libs
+       -rm -rf .libs *.dSYM *.map
 
 distclean :: clean
        -rm -f Makefile