From e5b3abe4dfa3c4baa7bdf1c7b040129f816cf433 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 4 Aug 1997 15:51:44 +0000 Subject: [PATCH] * deflex.l, defparse.y: Use VERSIONK rather than VERSION. * rclex.l, rcparse.y: Likewise. * Makefile.am (windres_SOURCES): Add $(BULIBS). * Makefile.in: Rebuild. --- binutils/ChangeLog | 7 +++++++ binutils/Makefile.am | 3 ++- binutils/Makefile.in | 5 +++-- binutils/rclex.l | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index dddc50a5bf8..5bc58399bdc 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,10 @@ +Mon Aug 4 11:47:31 1997 Ian Lance Taylor + + * deflex.l, defparse.y: Use VERSIONK rather than VERSION. + * rclex.l, rcparse.y: Likewise. + * Makefile.am (windres_SOURCES): Add $(BULIBS). + * Makefile.in: Rebuild. + Fri Aug 1 13:08:39 1997 Ian Lance Taylor * acinclude.m4: Include bfd/acinclude.m4, not bfd/acmacros.m4. diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 6f3809c3618..970f5c9613b 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -238,7 +238,8 @@ nlmconv.o: nlmconv.c $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h nlmconv_SOURCES = nlmconv.c nlmheader.y $(BULIBS) -windres_SOURCES = windres.c resrc.c rescoff.c resbin.c rcparse.y rclex.l +windres_SOURCES = windres.c resrc.c rescoff.c resbin.c rcparse.y rclex.l \ + $(BULIBS) windres_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ # Targets to rebuild dependencies in this Makefile. diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 75a32b4e4ee..ba8b06fe897 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -225,7 +225,8 @@ sysdump_SOURCES = sysdump.c $(BULIBS) nlmconv_SOURCES = nlmconv.c nlmheader.y $(BULIBS) -windres_SOURCES = windres.c resrc.c rescoff.c resbin.c rcparse.y rclex.l +windres_SOURCES = windres.c resrc.c rescoff.c resbin.c rcparse.y rclex.l \ + $(BULIBS) windres_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ CLEANFILES = dep.sed .dep .dep1 @@ -261,7 +262,7 @@ filemode.o dlltool_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a dlltool_LDFLAGS = windres_OBJECTS = windres.o resrc.o rescoff.o resbin.o rcparse.o \ -rclex.o +rclex.o bucomm.o version.o filemode.o windres_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a windres_LDFLAGS = size_OBJECTS = size.o bucomm.o version.o filemode.o diff --git a/binutils/rclex.l b/binutils/rclex.l index b92d9f358d1..b414210d0ae 100644 --- a/binutils/rclex.l +++ b/binutils/rclex.l @@ -99,7 +99,7 @@ static char *get_string PARAMS ((int)); "ICON" { return ICON; } "LANGUAGE" { return LANGUAGE; } "CHARACTERISTICS" { return CHARACTERISTICS; } -"VERSION" { return VERSION; } +"VERSION" { return VERSIONK; } "MENU" { return MENU; } "MENUEX" { return MENUEX; } "MENUITEM" { return MENUITEM; }