diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2021-05-09 12:23:26 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2021-05-09 12:23:26 +0300 |
| commit | 2cc075b59f843485510d00ce4ffb3654d5a908e8 (patch) | |
| tree | c177bd205cb6b24a6e4585db4e40d2f5c7fa00e2 /pc | |
| parent | 8303fcb4ac651568dff831da88c147bbebea3ba7 (diff) | |
| download | egawk-2cc075b59f843485510d00ce4ffb3654d5a908e8.tar.gz egawk-2cc075b59f843485510d00ce4ffb3654d5a908e8.tar.bz2 egawk-2cc075b59f843485510d00ce4ffb3654d5a908e8.zip | |
Fix the MinGW build.
Diffstat (limited to 'pc')
| -rw-r--r-- | pc/ChangeLog | 9 | ||||
| -rw-r--r-- | pc/Makefile | 9 |
2 files changed, 15 insertions, 3 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index 37821c66..10327b10 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,12 @@ +2021-05-09 Eli Zaretskii <eliz@gnu.org> + + * Makefile (VPATH): Adapt to addition of support/malloc + directory. + (DYNOBJS): New list with dependencies of new files in + support/malloc. + (LIBOBJS): Add DYNOBJS. + (regex$O): Depend on some files in support/malloc. + 2021-05-05 Arnold D. Robbins <arnold@skeeve.com> * Makefile.tst: Rebuilt. diff --git a/pc/Makefile b/pc/Makefile index beafd3d6..b2ca315e 100644 --- a/pc/Makefile +++ b/pc/Makefile @@ -101,7 +101,7 @@ DO_LNK = $($(LNK)) DO_BIND= $($(BIND)) #------------------------------------------------------------------------ # To allow Make find files in the support subdirectory. -VPATH = .;./support +VPATH = .;./support;./support/malloc #======================================================================== # End of general configuration. Some platform-specific configuration # notes appear below. @@ -241,7 +241,8 @@ ALLOBJS = $(AWKOBJS) awkgram$O getid$O $(OBJ) # LIBOBJS # GNU and other stuff that gawk uses as library routines. -LIBOBJS= getopt$O getopt1$O dfa$O regex$O random$O localeinfo$O +DYNOBJS= dynarray_resize$O dynarray_emplace_enlarge$O dynarray_finalize$O +LIBOBJS= getopt$O getopt1$O dfa$O random$O localeinfo$O regex$O $(DYNOBJS) GAWKOBJS = $(ALLOBJS) $(LIBOBJS) @@ -271,9 +272,11 @@ $(RSPFILE) : $(GAWKOBJS) # and we have -I. on the compiler command line. unistd.h is # included by awk.h. # 2. custom.h is not mentioned because pc ports don't use it. -$(ALLOBJS) $(LIBOBJS): \ +$(ALLOBJS) $(LIBOBJS) $(DYNOBJS): \ awk.h regex.h config.h gettext.h mbsupport.h protos.h dfa.h getopt.h nonposix.h +$(DYNOBJS) regex$O: dynarray.h libc-config.h malloc/dynarray.h malloc/dynarray-skeleton.c + builtin$O: floatmagic.h random.h popen.h random$O: random.h |