diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2012-05-14 22:53:39 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2012-05-14 22:53:39 +0300 |
| commit | 9e2a3076e2e1abbe89f8437826229a8011994764 (patch) | |
| tree | e1a1502ea04a6985547b0fc6556ce3bb4b19cea3 /pc | |
| parent | a8b749aa356c6f7bb0facd14220c2c0c14e40e6f (diff) | |
| download | gawk-9e2a3076e2e1abbe89f8437826229a8011994764.tar.gz | |
Fix merge problem in pc/Makefile.
Diffstat (limited to 'pc')
| -rw-r--r-- | pc/ChangeLog | 5 | ||||
| -rw-r--r-- | pc/Makefile | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index 1eb51812..62290d7e 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,8 @@ +2012-05-14 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile: Remove second mingw32-readline target. Bad + result from branch merging. + 2012-05-06 Eli Zaretskii <eliz@gnu.org> * config.sed: Update DJGPP -> __DJGPP__. diff --git a/pc/Makefile b/pc/Makefile index 21fe0bfe..f01849a8 100644 --- a/pc/Makefile +++ b/pc/Makefile @@ -178,13 +178,6 @@ mingw32-readline-mpfr: OBJ=popen.o LNK=LMINGW32 LF="-gdwarf-2 -g3" \ LF2="-lmpfr -lgmp -lreadline -lmsvcp60 -Wl,--enable-auto-import" RSP= -mingw32-readline: - $(MAK) all \ - CC=gcc O=.o CF="-DHAVE_LIBREADLINE -O2 -gdwarf-2 -g3" OBJ=popen.o \ - LNK=LMINGW32 PLNK=PLMINGW32 DLNK=DLMINGW32 \ - LF="-gdwarf-2 -g3" \ - LF2="-lreadline -lmsvcp60 -Wl,--enable-auto-import" RSP= - # Define BIND for BINDless compiles, otherwise $($(BIND)) may break. BIND = EMPTY PBIND = EMPTY |