| Makefile.am (flex-2.6.3) | : | Makefile.am (flex-2.6.4) |
|---|
| AM_YFLAGS = -d | | AM_YFLAGS = -d |
|
| localedir = $(datadir)/locale | | AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" |
| AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl | | |
| LIBS = @LIBS@ | | LIBS = @LIBS@ |
| | |
| m4 = @M4@ | | m4 = @M4@ |
| | |
| bin_PROGRAMS = flex | | bin_PROGRAMS = flex |
| if ENABLE_BOOTSTRAP | | if ENABLE_BOOTSTRAP |
| noinst_PROGRAMS = stage1flex | | noinst_PROGRAMS = stage1flex |
| endif | | endif |
| | |
| if ENABLE_LIBFL | | if ENABLE_LIBFL |
| | |
| skipping to change at line 25 | | skipping to change at line 24 |
|---|
| endif | | endif |
| libfl_la_SOURCES = \ | | libfl_la_SOURCES = \ |
| libmain.c \ | | libmain.c \ |
| libyywrap.c | | libyywrap.c |
| libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ | | libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ |
| | |
| stage1flex_SOURCES = \ | | stage1flex_SOURCES = \ |
| scan.l \ | | scan.l \ |
| $(COMMON_SOURCES) | | $(COMMON_SOURCES) |
| | |
|
| | if CROSS |
| | stage1flex_LDADD = |
| | stage1flex_SOURCES += \ |
| | ../lib/malloc.c \ |
| | ../lib/realloc.c |
| | stage1flex_LINK = $(LIBTOOL) --tag=CC --mode=link $(CC_FOR_BUILD) \ |
| | $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ |
| | |
| | $(stage1flex_OBJECTS): CC=$(CC_FOR_BUILD) |
| | $(stage1flex_OBJECTS): CFLAGS=$(CFLAGS_FOR_BUILD) |
| | $(stage1flex_OBJECTS): CPP=$(CPP_FOR_BUILD) |
| | $(stage1flex_OBJECTS): CPPFLAGS=$(CPPFLAGS_FOR_BUILD) |
| | $(stage1flex_OBJECTS): LDFLAGS=$(LDFLAGS_FOR_BUILD) |
| | else |
| | stage1flex_LDADD = $(LDADD) |
| | stage1flex_LINK = $(LINK) |
| stage1flex_CFLAGS = $(AM_CFLAGS) | | stage1flex_CFLAGS = $(AM_CFLAGS) |
|
| | endif |
| | |
| flex_SOURCES = \ | | flex_SOURCES = \ |
| $(COMMON_SOURCES) | | $(COMMON_SOURCES) |
| | |
| nodist_flex_SOURCES = \ | | nodist_flex_SOURCES = \ |
| stage1scan.c | | stage1scan.c |
| | |
| flex_CFLAGS = $(AM_CFLAGS) $(WARNINGFLAGS) | | flex_CFLAGS = $(AM_CFLAGS) $(WARNINGFLAGS) |
| | |
| COMMON_SOURCES = \ | | COMMON_SOURCES = \ |
| | |
| skipping to change at line 79 | | skipping to change at line 95 |
|---|
| EXTRA_DIST = \ | | EXTRA_DIST = \ |
| flex.skl \ | | flex.skl \ |
| mkskel.sh \ | | mkskel.sh \ |
| gettext.h | | gettext.h |
| | |
| CLEANFILES = stage1scan.c stage1flex$(EXEEXT) | | CLEANFILES = stage1scan.c stage1flex$(EXEEXT) |
| | |
| MAINTAINERCLEANFILES = skel.c | | MAINTAINERCLEANFILES = skel.c |
| | |
| skel.c: flex.skl mkskel.sh flexint.h tables_shared.h tables_shared.c | | skel.c: flex.skl mkskel.sh flexint.h tables_shared.h tables_shared.c |
|
| sed 's/4_/a4_/g; s/m4preproc_/m4_/g' $< | \ | | $(SHELL) $(srcdir)/mkskel.sh $(srcdir) $(m4) $(VERSION) > $@.tmp |
| $(m4) -P -I $(srcdir) \ | | |
| -DFLEX_MAJOR_VERSION=` echo $(VERSION)|cut -f 1 -d .` \ | | |
| -DFLEX_MINOR_VERSION=` echo $(VERSION)|cut -f 2 -d .` \ | | |
| -DFLEX_SUBMINOR_VERSION=`echo $(VERSION)|cut -f 3 -d .` | \ | | |
| $(SHELL) $(srcdir)/mkskel.sh > $@.tmp | | |
| mv $@.tmp $@ | | mv $@.tmp $@ |
| | |
| if ENABLE_BOOTSTRAP | | if ENABLE_BOOTSTRAP |
| stage1scan.c: scan.l stage1flex$(EXEEXT) | | stage1scan.c: scan.l stage1flex$(EXEEXT) |
|
| ./stage1flex$(EXEEXT) $(AM_LFLAGS) $(LFLAGS) -o $@ $< | | ./stage1flex$(EXEEXT) $(AM_LFLAGS) $(LFLAGS) -o $@ $(srcdir)/scan.l |
| else | | else |
| stage1scan.c: scan.c | | stage1scan.c: scan.c |
| sed 's|^\(#line .*\)"'`printf %s $< | sed 's|[][\\\\.*]|\\\\&|g'`'"|\1"$@
"|g' $< > $@ | | sed 's|^\(#line .*\)"'`printf %s $< | sed 's|[][\\\\.*]|\\\\&|g'`'"|\1"$@
"|g' $< > $@ |
| endif | | endif |
| | |
|
| | dist-hook: scan.l flex$(EXEEXT) |
| | chmod u+w $(distdir)/scan.c && \ |
| | ./flex$(EXEEXT) -o scan.c $< && \ |
| | mv scan.c $(distdir) |
| | |
| # make needs to be told to make parse.h so that parallelized runs will | | # make needs to be told to make parse.h so that parallelized runs will |
| # not fail. | | # not fail. |
| | |
|
| main.c: parse.h | | stage1flex-main.$(OBJEXT): parse.h |
| yylex.c: parse.h | | flex-main.$(OBJEXT): parse.h |
| | |
| | stage1flex-yylex.$(OBJEXT): parse.h |
| | flex-yylex.$(OBJEXT): parse.h |
| | |
| stage1flex-scan.$(OBJEXT): parse.h | | stage1flex-scan.$(OBJEXT): parse.h |
| flex-stage1scan.$(OBJEXT): parse.h | | flex-stage1scan.$(OBJEXT): parse.h |
| | |
| # Run GNU indent on sources. Don't run this unless all the sources compile clean
ly. | | # Run GNU indent on sources. Don't run this unless all the sources compile clean
ly. |
| # | | # |
| # Whole idea: | | # Whole idea: |
| # 1. Check for .indent.pro, otherwise indent will use unknown | | # 1. Check for .indent.pro, otherwise indent will use unknown |
| # settings, or worse, the GNU defaults.) | | # settings, or worse, the GNU defaults.) |
| # 2. Check that this is GNU indent. | | # 2. Check that this is GNU indent. |
| # 3. Make sure to process only the NON-generated .c and .h files. | | # 3. Make sure to process only the NON-generated .c and .h files. |
| | |
| skipping to change at line 138 | | skipping to change at line 158 |
|---|
| regex.c \ | | regex.c \ |
| scanopt.c \ | | scanopt.c \ |
| scanopt.h \ | | scanopt.h \ |
| sym.c \ | | sym.c \ |
| tables.c \ | | tables.c \ |
| tables.h \ | | tables.h \ |
| tables_shared.c \ | | tables_shared.c \ |
| tables_shared.h \ | | tables_shared.h \ |
| tblcmp.c | | tblcmp.c |
| | |
|
| indent: | | indent: $(top_srcdir)/.indent.pro |
| if [ -f .indent.pro ] ; then \ | | cd $(top_srcdir) && \ |
| for f in $(indentfiles);\ | | for f in $(indentfiles); do \ |
| do\ | | f=src/$$f; \ |
| echo indenting $$f ;\ | | echo indenting $$f; \ |
| f='$(srcdir)'/$$f; \ | | INDENT_PROFILE=.indent.pro $(INDENT) <$$f >/dev/null && \ |
| $(indent) < $$f >/dev/null && indent $$f || echo $$f FAILED to in | | INDENT_PROFILE=.indent.pro $(INDENT) $$f || \ |
| dent ;\ | | echo $$f FAILED to indent; \ |
| done \ | | done; |
| fi | | |
| | .PHONY: indent |
| | | |
| End of changes. 8 change blocks. |
|---|
| 11 lines changed or deleted | | 31 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 