prepare for wiz autoconf merge

This commit is contained in:
John Kerl 2015-09-21 22:13:04 -04:00
parent 55b5331fc2
commit a2955eab66
4 changed files with 10 additions and 10 deletions

View file

@ -7,15 +7,15 @@ devall: c install doc
# path to be picked up by the mlr-execs in the docs dir. better would be to
# export PATH here with ./c at its head.
c: .always
make -C c top
make -C c -f Makefile.no-autoconfig top
doc: .always
cd doc && poki
install: .always
make -C c install
make -C c -f Makefile.no-autoconfig install
install -d -m 0755 $(DESTDIR)/$(MANDIR)
install -m 0644 doc/miller.1 $(DESTDIR)/$(MANDIR)
clean: .always
make -C c clean
make -C c -f Makefile.no-autoconfig clean
.PHONY: manpage
# OSX:
# * brew install asciidoc

View file

@ -150,12 +150,12 @@ mlr.static: .always dsls
$(CCOPT) -static $(NON_DSL_SRCS) $(PDSL_OBJS) $(FDSL_OBJS) $(LFLAGS) -o mlr.static
dsls: .always
make -C dsls put_dsl_parse.o
make -C dsls put_dsl_lexer.o
make -C dsls put_dsl_wrapper.o
make -C dsls filter_dsl_parse.o
make -C dsls filter_dsl_lexer.o
make -C dsls filter_dsl_wrapper.o
make -C dsls -f Makefile.no-autoconfig put_dsl_parse.o
make -C dsls -f Makefile.no-autoconfig put_dsl_lexer.o
make -C dsls -f Makefile.no-autoconfig put_dsl_wrapper.o
make -C dsls -f Makefile.no-autoconfig filter_dsl_parse.o
make -C dsls -f Makefile.no-autoconfig filter_dsl_lexer.o
make -C dsls -f Makefile.no-autoconfig filter_dsl_wrapper.o
# ----------------------------------------------------------------
# Other executable variants
@ -248,7 +248,7 @@ getl: .always
# ================================================================
clean:
@rm -vf mlr mlrd mlrg mlrp tester
@make -C dsls clean
@make -C dsls -f Makefile.no-autoconfig clean
perfclean profclean:
@rm -vf gmon.out perf.data perf.data.old
.always: