X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=c%2B%2B%2FMakefile.in;h=9555320e4c6b63e2b0a0d4d5db5f30c5fb6243d1;hp=630499450afe2953b18d9a99bd0c92b27db30ed5;hb=refs%2Ftags%2Fv5.3;hpb=c633e5103a29a38532cf1925257b91cea33fd090

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 63049945..9555320e 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.56 2000/10/15 00:43:38 tom Exp $
+# $Id: Makefile.in,v 1.64 2002/01/19 20:25:31 NIIBE.Yutaka Exp $
 ##############################################################################
-# Copyright (c) 1998,1999 Free Software Foundation, Inc.                     #
+# Copyright (c) 1998,1999,2000,2001,2002 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"), #
@@ -55,9 +55,13 @@ INSTALL_DATA	= @INSTALL_DATA@
 
 AR		= @AR@
 AR_OPTS		= @AR_OPTS@
+
+CXX_AR		= @CXX_AR@
+CXX_AR_OPTS	= @CXX_AR_OPTS@
 RANLIB		= @RANLIB@
 
 CXX		= @CXX@
+CPP		= @CPP@
 CXXFLAGS	= @CXXFLAGS@
 CXXLIBS		= @CXXLIBS@
 
@@ -87,9 +91,9 @@ LIBNAME_LIBTOOL	= @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.la
 LIBNAME_NORMAL	= @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.a
 LIBNAME		= @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@
 
-LINK_FLAGS	= @EXTRA_LDFLAGS@ -L../lib -L$(libdir) -l$(LIBROOT)
+LINK_FLAGS	= @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@LIB_SUFFIX@
 
-LINK_LIBTOOL	= @EXTRA_LDFLAGS@ -L../lib -L$(libdir) ../lib/$(LIBNAME)
+LINK_LIBTOOL	= @EXTRA_LDFLAGS@ -L../lib ../lib/$(LIBNAME)
 LINK_NORMAL	= $(LINK_FLAGS)
 LINK_DEBUG	= $(LINK_FLAGS)
 LINK_PROFILE	= $(LINK_FLAGS)
@@ -116,6 +120,8 @@ all ::		demo$x
 
 sources :	$(AUTO_SRC)
 
+depend :
+
 # Build a conventional library for installing, since a shared library would
 # pull in all of the ncurses libraries (panel, menu, form, ncurses) as direct
 # dependencies.
@@ -130,7 +136,7 @@ LIB_OBJS = \
 	$(MODEL)/cursesmain.o
 
 ../lib/$(LIBNAME_NORMAL) : $(LIB_OBJS)
-	$(AR) $(AR_OPTS) $@ $?
+	$(CXX_AR) $(CXX_AR_OPTS) $@ $?
 	$(RANLIB) $@
 
 ../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
@@ -153,7 +159,7 @@ etip.h:	$(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
 	sh $(srcdir)/edit_cfg.sh ../include/ncurses_cfg.h $@
 
 $(DESTDIR)$(libdir) :
-	$(srcdir)/../mkinstalldirs $@
+	sh $(srcdir)/../mkinstalldirs $@
 
 install \
 install.libs:: ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
@@ -164,9 +170,10 @@ uninstall.libs::
 	-$(LIBTOOL) rm -f $(DESTDIR)$(libdir)/$(LIBNAME)
 
 mostlyclean ::
-	-rm -f core tags TAGS *~ *.ln *.atac trace
+	-rm -f core tags TAGS *~ *.bak *.i *.ii *.ln *.atac trace
 
 clean :: mostlyclean
+	-rm -rf $(MODEL)/SunWS_cache
 	-$(LIBTOOL) rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(LIB_OBJS:.o=.lo) $(OBJS_DEMO)
 	-rm -rf .libs