X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2FMakefile.in;h=2e3f3c55d165c94ef7588ee464c69ff5f9822935;hp=6418dc63e47faf2689d5c2653c1e71ecd02a70f1;hb=9f479192e3ca3413d235c66bf058f8cc63764898;hpb=a7e05fb9806cc1255b6ba4fb29e15d337f35b2ad

diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index 6418dc63..2e3f3c55 100644
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.173 2020/08/17 13:38:30 tom Exp $
+# $Id: Makefile.in,v 1.179 2021/06/17 21:11:08 tom Exp $
 ##############################################################################
-# Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
 # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -50,7 +50,7 @@ SHELL		= @SHELL@
 VPATH		= @srcdir@
 THIS		= Makefile
 
-CF_MFLAGS 	= @cf_cv_makeflags@
+TOP_MFLAGS	= @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
 @SET_MAKE@
 
 x		= @EXEEXT@
@@ -99,7 +99,7 @@ ETAGS		= @ETAGS@
 
 CC		= @CC@
 CPP		= @CPP@
-CFLAGS		= @CFLAGS@
+CFLAGS		= @CFLAGS@ @EXTRA_CFLAGS@
 LIBS		= @LIBS@
 
 INCDIR		= $(srcdir)/../include
@@ -178,7 +178,7 @@ AUTO_SRC = \
 	init_keytry.h \
 	keys.list
 
-HEADER_DEPS	= \
+HEADER_DEPS	= @INTERNALS_HDR@ \
 	../include/ncurses_cfg.h \
 	../include/ncurses_def.h \
 	../include/ncurses_dll.h \
@@ -186,17 +186,17 @@ HEADER_DEPS	= \
 	../include/term.h \
 	../include/unctrl.h \
 	$(INCDIR)/nc_alloc.h \
-	$(INCDIR)/nc_mingw.h \
 	$(INCDIR)/nc_panel.h \
 	$(INCDIR)/nc_string.h \
 	$(INCDIR)/nc_termios.h \
 	$(INCDIR)/nc_tparm.h \
+	$(INCDIR)/nc_win32.h \
 	$(INCDIR)/term_entry.h \
 	$(srcdir)/curses.priv.h \
 	$(srcdir)/new_pair.h
 
 TEST_DEPS	= ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
-TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
+TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
 TEST_LDFLAGS	= @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@
 
 TEST_PROGS = \
@@ -219,7 +219,7 @@ win32con = $(srcdir)/win32con
 ################################################################################
 all libs ::	$(AUTO_SRC) ../lib $(LIBRARIES)
 
-@CHECK_BUILD@all libs ::	report_offsets$(BUILD_EXEEXT) 
+@CHECK_BUILD@all libs ::	report_offsets$(BUILD_EXEEXT)
 
 sources:	$(AUTO_SRC)
 
@@ -244,7 +244,7 @@ keys.list :	$(tinfo)/MKkeys_list.sh
 make_keys$(BUILD_EXEEXT) : \
 		build.priv.h \
 		$(tinfo)/make_keys.c \
-		names.c
+		./names.c
 	$(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
 
 make_hash$(BUILD_EXEEXT) : \
@@ -314,7 +314,7 @@ realclean :: distclean
 ../include/hashsize.h \
 ../include/parametrized.h \
 ../include/term.h :
-	cd ../include; $(MAKE) $(CF_MFLAGS)
+	( cd ../include && $(MAKE) $(TOP_MFLAGS) )
 
 # These rules build test-programs for the modules that have test-drivers
 test_progs : $(TEST_PROGS)
@@ -340,7 +340,7 @@ link_test$x : ./link_test.c $(TEST_DEPS) \
 	@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
+	( cd ../progs && $(MAKE) ../@DFT_OBJ_SUBDIR@/dump_entry$o )
 
 report_hashing$x : \
 		$(srcdir)/curses.priv.h \