X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=c%2B%2B%2FMakefile.in;h=889829c97fce35b88e2f46355f7ca08f10772f53;hp=c598e48fa112691441cd4c7d8905d3edfbfbb317;hb=d4d1d81ab6fc1ad681ff120d925099f947fefcf3;hpb=275aeb5889b10a51796b311f3773aeaea4d0a754 diff --git a/c++/Makefile.in b/c++/Makefile.in index c598e48f..889829c9 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.92 2010/09/04 21:29:06 tom Exp $ +# $Id: Makefile.in,v 1.95 2011/07/30 22:52:07 tom Exp $ ############################################################################## -# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. # +# Copyright (c) 1998-2010,2011 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"), # @@ -35,6 +35,7 @@ .SUFFIXES: SHELL = /bin/sh +VPATH = @srcdir@ CF_MFLAGS = @cf_cv_makeflags@ @SET_MAKE@ @@ -111,6 +112,7 @@ LIBNAME = @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@ MY_LIBRARY = ../lib/$(LIBNAME) LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@LIB_SUFFIX@ +RPATH_LIST = @RPATH_LIST@ LINK_LIBTOOL = @EXTRA_LDFLAGS@ -L../lib $(MY_LIBRARY) LINK_NORMAL = $(LINK_FLAGS) @@ -168,7 +170,7 @@ LIB_OBJS = \ cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \ -o $(LIBNAME) $(LIB_OBJS:$o=.lo) \ -rpath $(INSTALL_PREFIX)$(libdir) \ - $(LIBTOOL_VERSION) $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST) + $(LIBTOOL_VERSION) $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(LDFLAGS_LIBTOOL) $(SHLIB_LIST) OBJS_DEMO = $(MODEL)/demo$o