Skip to content

Commit

Permalink
Merge branch 'rav'
Browse files Browse the repository at this point in the history
bpringlemeir committed Aug 2, 2019
2 parents 6e27791 + d2d83eb commit c7ceaec
Showing 88 changed files with 217 additions and 67,817 deletions.
5 changes: 0 additions & 5 deletions .cvsignore

This file was deleted.

50 changes: 39 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,40 @@
*.[ao]
*.out
*.output
*.bak
*.lcd
*.lcs
*.lh
*.gen
TAGS
tags

.deps
Makefile
*.o
config.h
config.log
config.status
src/.deps/
src/Headers/flag_codes.gen
src/cgrammar.c
src/cscanner.c
src/lex.yy.c
src/llgrammar.c
src/signature.c
Makefile.in
/configure
/config.h
/config.h.in
/config.log
/config.status
/stamp-h1
/aclocal.m4
/autom4te.cache
/src/splint

*.lex.c
*.tab.c
*.tab.h

cgrammar_tokens.h
llgrammar_gen.h
mtgrammar_tokens.h
signature_gen.h

/src/lex.yy.c
/src/cscanner.c
/src/cgrammar.c
/src/mtgrammar.c
/src/llgrammar.c
/src/signature.c
/src/Headers/flag_codes.gen
50 changes: 1 addition & 49 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -24,52 +24,4 @@
## To report a bug: [email protected]
##

.PHONY: test

AUTOMAKE_OPTIONS = 1.5 foreign

binaryfixscript = ./fixBinaryDist.sh
SUBDIRS = src lib imports test doc

binaryDir = bin
binaryDirFiles = $(binaryDir)/Makefile.am $(binaryDir)/Makefile.in

binaryBuiltFiles = Makefile.binary.am configure.binary.ac

#include these in case we're trying to build on a systems
#without the bleeding edge versions of automake and autoconf
binaryDerivedFiles = Makefile.binary.in configure.binary

#try to remake these but don't stop if it fails.
configure.binary:configure.binary.ac
-autoconf -oconfigure.binary configure.binary.ac

Makefile.binary.in:Makefile.binary.am
-automake Makefile.binary
$(SED) -e s/Makefile\.binary/Makefile/ Makefile.binary.in > tMakefile.binary.in
# $(RM) Makefile.binary.in
$(CP) tMakefile.binary.in Makefile.binary.in
#drl add this hack 3/1/2003
#make the generated makefile depend on Makefile not Makefile.binary

$(binaryDir)/Makefile.in: $(binaryDir)/Makefile.am
-automake $(binaryDir)/Makefile

EXTRA_DIST = $(binaryfixscript) $(binaryBuiltFiles) $(binaryDerivedFiles) $(binaryDirFiles) install.html

preDist: $(binaryDir)/Makefile.in $(binaryDerivedFiles)

bindist: $(binaryDerivedFiles)
$(MAKE)
$(RM) -f $(binaryDir)/splint
$(CP) src/splint $(binaryDir)/splint
$(MV) install.html installSource.html
$(CP) doc/` uname | tr [A-Z] [a-z]`.html install.html
$(MAKE) -e dist dh_script=$(binaryfixscript) SUBDIRS="$(binaryDir) lib imports doc"
$(MV) $(distdir).tar.gz $(distdir).`uname`.tgz
$(MV) installSource.html install.html

dist-hook:
cd $(distdir); pwd; $(dh_script)


SUBDIRS = src lib imports doc test
36 changes: 0 additions & 36 deletions Makefile.binary.am

This file was deleted.

Loading

0 comments on commit c7ceaec

Please sign in to comment.