diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2012-11-04 18:18:17 -0800 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2012-11-04 18:18:17 -0800 |
| commit | 58a8c0edfa213572fd6ef7ba7705c4031d6f7928 (patch) | |
| tree | 73012bd2124c90bd9db7dee490cb4e3e2f02e700 /Makefile.am | |
| parent | 0960e23e38178233fc295c3d87760f6f8fac58bf (diff) | |
| parent | b8577c30fcc6e962e341f5ab3402197cd9bb1124 (diff) | |
| download | flex-58a8c0edfa213572fd6ef7ba7705c4031d6f7928.tar.gz flex-58a8c0edfa213572fd6ef7ba7705c4031d6f7928.tar.bz2 flex-58a8c0edfa213572fd6ef7ba7705c4031d6f7928.zip | |
Merge commit 'upstream/2.5.37'
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 5bad607..63e5e65 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,6 +66,9 @@ flex_SOURCES = \ filter.c \ regex.c + +LDADD = lib/libcompat.a + libfl_a_SOURCES = \ libmain.c \ libyywrap.c @@ -90,21 +93,22 @@ noinst_HEADERS = \ include_HEADERS = \ FlexLexer.h -EXTRA_DIST = \ - .indent.pro \ +dist_doc_DATA = \ AUTHORS \ COPYING \ - INSTALL \ NEWS \ ONEWS \ README \ README.cvs \ - THANKS \ - TODO \ + TODO + +EXTRA_DIST = \ + .indent.pro \ + ABOUT-NLS \ + INSTALL \ autogen.sh \ flex.skl \ mkskel.sh \ - ABOUT-NLS \ config.rpath \ gettext.h @@ -112,9 +116,9 @@ BUILT_SOURCES = \ skel.c SUBDIRS = \ + lib \ . \ doc \ - m4 \ examples \ po \ tools \ @@ -154,11 +158,11 @@ tblcmp.o: tblcmp.c flexdef.h flexint.h yylex.o: yylex.c flexdef.h flexint.h parse.h filter.o: filter.c flexdef.h flexint.h -# Create the ChangeLog, but only if we're inside a cvs working directory +# Create the ChangeLog, but only if we're inside a git working directory -ChangeLog: $(srcdir)/tools/cvsauthors $(srcdir)/tools/cvs2cl.pl - if [ -d CVS ] ; then \ - sh $(srcdir)/tools/cvs2cl.pl -F trunk -U $(srcdir)/tools/cvsauthors \ +ChangeLog: $(srcdir)/tools/git2cl + if [ -d $(srcdir)/.git ] ; then \ + $(srcdir)/tools/git2cl > $@ \ ; fi # Run GNU indent on sources. Don't run this unless all the sources compile cleanly. @@ -205,4 +209,8 @@ indent: done \ fi +install-exec-hook: + cd $(DESTDIR)/$(bindir) && \ + $(LN_S) -f flex$(EXEEXT) flex++$(EXEEXT) + .PHONY: ChangeLog tags indent |