ncurses 5.9 - patch 20121026

[ncurses.git] / ncurses / Makefile.in

diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index 45a26b9d7eaa968dbc4645040eb6edc9334a9793..79f4ebcf14581d48246b87138338e4e5c9cbeed0 100644 (file)
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.130 2010/11/27 21:45:27 tom Exp $
+# $Id: Makefile.in,v 1.135 2012/10/06 18:58:03 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2011,2012 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"), #
@@ -64,6 +64,7 @@ exec_prefix   = @exec_prefix@
 bindir         = @bindir@
 libdir         = @libdir@
 includedir     = @includedir@
+datarootdir    = @datarootdir@
 datadir                = @datadir@
 
 LIBTOOL                = @LIBTOOL@
@@ -107,7 +108,7 @@ BUILD_LIBS  = @BUILD_LIBS@
 # is compiled into the build, or are test-programs that are not installed.
 
 BUILD_EXEEXT   = @BUILD_EXEEXT@
-x              = @PROG_EXT@
+x              = @EXEEXT@
 
 CFLAGS_LIBTOOL = $(CCFLAGS)
 CFLAGS_NORMAL  = $(CCFLAGS)
@@ -125,6 +126,7 @@ SHLIB_LIST  = $(SHLIB_DIRS) @SHLIB_LIST@
 TINFO_LIST     = $(SHLIB_DIRS) @TINFO_LIST@
 TICS_LIST      = $(SHLIB_DIRS) @TICS_LIST@
 
+RPATH_LIST     = @RPATH_LIST@
 MK_SHARED_LIB  = @MK_SHARED_LIB@
 
 NCURSES_MAJOR  = @NCURSES_MAJOR@
@@ -134,7 +136,7 @@ ABI_VERSION = @cf_cv_abi_version@
 
 RANLIB         = @LIB_PREP@
 
-LIBRARIES      = @LIBS_TO_MAKE@
+LIBRARIES      = @Libs_To_Make@
 
 LINT           = @LINT@
 LINT_OPTS      = @LINT_OPTS@
@@ -282,21 +284,21 @@ test_progs : $(TEST_PROGS)
        sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" implemented <../include/curses.h >$@
 
 captoinfo$x : $(tinfo)/captoinfo.c $(TEST_DEPS)
-       @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DMAIN $(tinfo)/captoinfo.c $(TEST_LDFLAGS)
+       @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DMAIN $(tinfo)/captoinfo.c $(TEST_LDFLAGS)
 
 hardscroll$x : $(serial)/hardscroll.c $(TEST_DEPS)
-       @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DSCROLLDEBUG $(serial)/hardscroll.c $(TEST_LDFLAGS)
+       @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DSCROLLDEBUG $(serial)/hardscroll.c $(TEST_LDFLAGS)
 
 hashmap$x : $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_DEPS)
-       @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_LDFLAGS)
+       @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_LDFLAGS)
 
 lib_mvcur$x : $(serial)/lib_mvcur.c $(TEST_DEPS) \
                ../@DFT_OBJ_SUBDIR@/dump_entry$o
-       @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST -I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o $(TEST_LDFLAGS)
+       @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST -I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o $(TEST_LDFLAGS)
 
 link_test$x : ./link_test.c $(TEST_DEPS) \
                ../@DFT_OBJ_SUBDIR@/link_test$o
-       @ECHO_LINK@ $(CC) -o $@ $(CFLAGS_DEFAULT) ../@DFT_OBJ_SUBDIR@/link_test$o $(TEST_LDFLAGS)
+       @ECHO_LD@ $(CC) -o $@ $(CFLAGS_DEFAULT) ../@DFT_OBJ_SUBDIR@/link_test$o $(TEST_LDFLAGS)
 
 ../@DFT_OBJ_SUBDIR@/dump_entry$o:
        cd ../progs && $(MAKE) ../@DFT_OBJ_SUBDIR@/dump_entry$o