Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-18 16:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/Makefile.am (INCLUDES): s/PFILE/BISON_SIMPLE/.

Browse Source 
s/PFILE1/BISON_HAIRY/.
Adjust dependencies.
This commit is contained in:
Akim Demaille
2000-11-03 17:31:47 +00:00
parent d1cdce7c1c
commit 095a3fb52f
4 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2000-11-03 Akim Demaille <akim@epita.fr>
* src/Makefile.am (INCLUDES): s/PFILE/BISON_SIMPLE/.
s/PFILE1/BISON_HAIRY/.
Adjust dependencies.
2000-11-03 Akim Demaille <akim@epita.fr> 2000-11-03 Akim Demaille <akim@epita.fr>
For some reasons, this has not been applied. For some reasons, this has not been applied.

5
src/Makefile.am
View File

@@ -2,9 +2,10 @@
AUTOMAKE_OPTIONS = 1.4 ../lib/ansi2knr AUTOMAKE_OPTIONS = 1.4 ../lib/ansi2knr
DEFS = @DEFS@ \ DEFS = @DEFS@ \
-DXPFILE=\"${datadir}/bison.simple\" \ -DBISON_SIMPLE=\"${datadir}/bison.simple\" \
-DXPFILE1=\"${datadir}/bison.hairy\" \ -DBISON_HAIRY=\"${datadir}/bison.hairy\" \
-DLOCALEDIR=\"${datadir}/locale\" -DLOCALEDIR=\"${datadir}/locale\"
INCLUDES = -I../intl -I$(top_srcdir)/lib -I.. INCLUDES = -I../intl -I$(top_srcdir)/lib -I..
LDADD = @INTLLIBS@ ../lib/libbison.a LDADD = @INTLLIBS@ ../lib/libbison.a

20
src/files.c
View File

@@ -22,20 +22,20 @@
#include "system.h" #include "system.h"
#if defined (VMS) & !defined (__VMS_POSIX) #if defined (VMS) & !defined (__VMS_POSIX)
# ifndef XPFILE # ifndef BISON_SIMPLE
# define XPFILE "GNU_BISON:[000000]BISON.SIMPLE" # define BISON_SIMPLE "GNU_BISON:[000000]BISON.SIMPLE"
# endif # endif
# ifndef XPFILE1 # ifndef BISON_HAIRY
# define XPFILE1 "GNU_BISON:[000000]BISON.HAIRY" # define BISON_HARIRY "GNU_BISON:[000000]BISON.HAIRY"
# endif # endif
#endif #endif
#if defined (_MSC_VER) #if defined (_MSC_VER)
# ifndef XPFILE # ifndef BISON_SIMPLE
# define XPFILE "c:/usr/local/lib/bison.simple" # define BISON_SIMPLE "c:/usr/local/lib/bison.simple"
# endif # endif
# ifndef XPFILE1 # ifndef BISON_HAIRY
# define XPFILE1 "c:/usr/local/lib/bison.hairy" # define BISON_HAIRY "c:/usr/local/lib/bison.hairy"
# endif # endif
#endif #endif
@@ -290,7 +290,7 @@ open_files (void)
finput = xfopen (infile, "r"); finput = xfopen (infile, "r");
if (!no_parser_flag) if (!no_parser_flag)
fparser = xfopen (skeleton_find ("BISON_SIMPLE", PFILE), "r"); fparser = xfopen (skeleton_find ("BISON_SIMPLE", BISON_SIMPLE), "r");
if (verbose_flag) if (verbose_flag)
{ {
@@ -354,7 +354,7 @@ open_extra_files (void)
xfclose (fparser); xfclose (fparser);
if (!no_parser_flag) if (!no_parser_flag)
fparser = xfopen (skeleton_find ("BISON_HAIRY", PFILE1), "r"); fparser = xfopen (skeleton_find ("BISON_HAIRY", BISON_HAIRY), "r");
fguard = xfopen (guardfile, "w"); fguard = xfopen (guardfile, "w");
} }

3
src/files.h
View File

@@ -24,9 +24,6 @@
When bison is installed, they should be absolute pathnames. When bison is installed, they should be absolute pathnames.
XPFILE1 and XPFILE2 normally come from config.h. */ XPFILE1 and XPFILE2 normally come from config.h. */
#define PFILE XPFILE /* Simple parser */
#define PFILE1 XPFILE1 /* Semantic parser */
/* File name specified with -o for the output file, or 0 if no -o. */ /* File name specified with -o for the output file, or 0 if no -o. */
extern char *spec_outfile; extern char *spec_outfile;