ncurses 5.7 - patch 20101023

[ncurses.git] / ncurses / Makefile.in

diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index a46c3291dffc7472785a90c9813f40f9e1696242..ede69ed28e41b7e92375a25199717924e80d2c20 100644 (file)
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.118 2009/08/08 17:42:06 tom Exp $
+# $Id: Makefile.in,v 1.129 2010/10/23 20:53:01 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2009,2010 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"), #


@@ -84,6 +84,9 @@ AWK           = @AWK@
 LD             = @LD@
 LN_S           = @LN_S@
 
 LD             = @LD@
 LN_S           = @LN_S@
 

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

 CC             = @CC@
 CPP            = @CPP@
 CFLAGS         = @CFLAGS@
 CC             = @CC@
 CPP            = @CPP@
 CFLAGS         = @CFLAGS@


@@ -93,7 +96,7 @@ CPPFLAGS      = -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) @CPPFLAGS@
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 

-BUILD_CPPFLAGS = -I../include @BUILD_CPPFLAGS@
+BUILD_CPPFLAGS = -I../include -DUSE_BUILD_CC @BUILD_CPPFLAGS@

 BUILD_CC       = @BUILD_CC@
 BUILD_CCFLAGS  = -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) -I$(INCDIR) $(BUILD_CPPFLAGS) @BUILD_CFLAGS@
 BUILD_LDFLAGS  = @BUILD_LDFLAGS@
 BUILD_CC       = @BUILD_CC@
 BUILD_CCFLAGS  = -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) -I$(INCDIR) $(BUILD_CPPFLAGS) @BUILD_CFLAGS@
 BUILD_LDFLAGS  = @BUILD_LDFLAGS@


@@ -141,6 +144,10 @@ FALLBACK_LIST      = @FALLBACK_LIST@
 USE_BIG_STRINGS        = @USE_BIG_STRINGS@
 TERMINFO_CAPS  = $(top_srcdir)/include/@TERMINFO_CAPS@
 
 USE_BIG_STRINGS        = @USE_BIG_STRINGS@
 TERMINFO_CAPS  = $(top_srcdir)/include/@TERMINFO_CAPS@
 

+TERMINFO       = @TERMINFO@
+TERMINFO_SRC   = @TERMINFO_SRC@
+TIC_PATH       = @TIC_PATH@
+

 AUTO_SRC = \
        ./codes.c \
        ./comp_captab.c \
 AUTO_SRC = \
        ./codes.c \
        ./comp_captab.c \


@@ -154,6 +161,18 @@ AUTO_SRC = \
        init_keytry.h \
        keys.list
 
        init_keytry.h \
        keys.list
 

+HEADER_DEPS    = \
+       $(srcdir)/curses.priv.h \
+       ../include/ncurses_dll.h \
+       ../include/ncurses_cfg.h \
+       ../include/curses.h \
+       $(INCDIR)/nc_panel.h \
+       ../include/term.h \
+       $(INCDIR)/term_entry.h \
+       $(INCDIR)/nc_tparm.h \
+       $(INCDIR)/nc_alloc.h \
+       $(INCDIR)/nc_mingw.h
+

 TEST_DEPS      = ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
 TEST_ARGS      = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
 TEST_LDFLAGS   = @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@
 TEST_DEPS      = ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
 TEST_ARGS      = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
 TEST_LDFLAGS   = @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@


@@ -180,12 +199,12 @@ sources:  $(AUTO_SRC)
 
 $(DESTDIR)$(bindir) \
 $(DESTDIR)$(libdir) :
 
 $(DESTDIR)$(bindir) \
 $(DESTDIR)$(libdir) :

-       sh $(srcdir)/../mkdirs.sh $@
+       mkdir -p $@

 
 ../lib : ; mkdir $@
 
 ./fallback.c : $(tinfo)/MKfallback.sh
 
 ../lib : ; mkdir $@
 
 ./fallback.c : $(tinfo)/MKfallback.sh

-       sh -e $(tinfo)/MKfallback.sh @TERMINFO@ @TERMINFO_SRC@ $(FALLBACK_LIST) >$@
+       sh -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@

 
 ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
        sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
 
 ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
        sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@


@@ -206,7 +225,7 @@ make_hash$(BUILD_EXEEXT) : \
                ../include/hashsize.h
        $(BUILD_CC) -o $@ $(BUILD_CCFLAGS) $(tinfo)/make_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
 
                ../include/hashsize.h
        $(BUILD_CC) -o $@ $(BUILD_CCFLAGS) $(tinfo)/make_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
 

-./expanded.c : curses.priv.h $(serial)/MKexpanded.sh
+./expanded.c : $(srcdir)/curses.priv.h $(serial)/MKexpanded.sh

        sh -e $(serial)/MKexpanded.sh "$(CPP)" $(CPPFLAGS) > $@
 
 ./comp_captab.c: \
        sh -e $(serial)/MKexpanded.sh "$(CPP)" $(CPPFLAGS) > $@
 
 ./comp_captab.c: \


@@ -229,10 +248,10 @@ make_hash$(BUILD_EXEEXT) : \
        echo | $(AWK) -f $(base)/MKunctrl.awk bigstrings=$(USE_BIG_STRINGS) >$@
 
 tags:
        echo | $(AWK) -f $(base)/MKunctrl.awk bigstrings=$(USE_BIG_STRINGS) >$@
 
 tags:

-       ctags *.[ch] */*.[ch]
+       $(CTAGS) *.[ch] */*.[ch]

 
 @MAKE_UPPER_TAGS@TAGS:
 
 @MAKE_UPPER_TAGS@TAGS:

-@MAKE_UPPER_TAGS@      etags *.[ch] */*.[ch]
+@MAKE_UPPER_TAGS@      $(ETAGS) *.[ch] */*.[ch]

 
 mostlyclean ::
        -rm -f core tags TAGS *~ *.bak *.i *.ln *.atac trace
 
 mostlyclean ::
        -rm -f core tags TAGS *~ *.bak *.i *.ln *.atac trace