improved org

Author: amahboubi

Makefile

@@ -0,0 +1,4 @@
+# -*- Makefile -*-
+
+# --------------------------------------------------------------------
+include Makefile.common

Makefile.common

@@ -0,0 +1,99 @@
+# -*- Makefile -*-
+
+######################################################################
+# USAGE:                                                             #
+# The rules this-config::, this-build::, this-distclean::,           #
+# pre-makefile::, this-clean:: and __always__:: may be extended      #
+# Additionally, the following variables may be customized:           #
+SUBDIRS?=
+COQBIN?=$(dir $(shell which coqtop))
+COQMAKEFILE?=$(COQBIN)coq_makefile
+COQDEP?=$(COQBIN)coqdep
+COQPROJECT?=_CoqProject
+COQMAKEOPTIONS?=
+COQMAKEFILEOPTIONS?=
+V?=
+VERBOSE?=V
+######################################################################
+
+# local context: -----------------------------------------------------
+.PHONY: all config build clean distclean __always__
+.SUFFIXES:
+
+H:= $(if $(VERBOSE),,@)  # not used yet
+TOP     = $(dir $(lastword $(MAKEFILE_LIST)))
+COQMAKE = $(MAKE) -f Makefile.coq $(COQMAKEOPTIONS)
+BRANCH_coq:= $(shell $(COQBIN)coqtop -v | head -1 | grep -E '(trunk|master)' \
+	      | wc -l | sed 's/ *//g')
+
+# coq version:
+ifneq "$(BRANCH_coq)" "0"
+COQVVV:= dev
+else
+COQVVV:=$(shell $(COQBIN)coqtop --print-version | cut -d" " -f1)
+endif
+
+COQV:= $(shell echo $(COQVVV) | cut -d"." -f1)
+COQVV:= $(shell echo $(COQVVV) | cut -d"." -f1-2)
+
+# all: ---------------------------------------------------------------
+all: config build
+
+# Makefile.coq: ------------------------------------------------------
+.PHONY: pre-makefile
+
+Makefile.coq: pre-makefile $(COQPROJECT) Makefile
+	$(COQMAKEFILE) $(COQMAKEFILEOPTIONS) -f $(COQPROJECT) -o Makefile.coq
+
+# Global config, build, clean and distclean --------------------------
+config: sub-config this-config
+
+build: sub-build this-build
+
+clean: sub-clean this-clean
+
+distclean: sub-distclean this-distclean
+
+# Local config, build, clean and distclean ---------------------------
+.PHONY: this-config this-build this-distclean this-clean
+
+this-config:: __always__
+
+this-build:: this-config Makefile.coq
+	+$(COQMAKE)
+
+this-distclean:: this-clean
+	rm -f Makefile.coq Makefile.coq.conf Makefile.coq
+
+this-clean:: __always__
+	@if [ -f Makefile.coq ]; then $(COQMAKE) cleanall; fi
+
+# Install target -----------------------------------------------------
+.PHONY: install
+
+install: __always__ Makefile.coq
+	$(COQMAKE) install
+# counting lines of Coq code -----------------------------------------
+.PHONY: count
+
+COQFILES = $(shell grep '.v$$' $(COQPROJECT))
+
+count:
+	@coqwc $(COQFILES) | tail -1 | \
+	  awk '{printf ("%d (spec=%d+proof=%d)\n", $$1+$$2, $$1, $$2)}'
+# Additionally cleaning backup (*~) files ----------------------------
+this-distclean::
+	rm -f $(shell find . -name '*~')
+
+# Make in SUBDIRS ----------------------------------------------------
+ifdef SUBDIRS
+sub-%: __always__
+	@set -e; for d in $(SUBDIRS); do +$(MAKE) -C $$d $(@:sub-%=%); done
+else
+sub-%: __always__
+	@true
+endif
+
+# Make of individual .vo ---------------------------------------------
+%.vo: __always__ Makefile.coq
+	+$(COQMAKE) $@

_CoqProject

@@ -1,48 +1,48 @@
 -arg -w
 -arg -parsing
 
-a_props.v
-annotated_recs_b.v
-annotated_recs_c.v
-annotated_recs_d.v
-annotated_recs_s.v
-annotated_recs_v.v
-annotated_recs_z.v
-algo_closures.v
-arithmetics.v
-b_over_a_props.v
-b_props.v
-bigopz.v
-binomialz.v
-c_props.v
-conj.v
-extra_cauchyreals.v
-extra_mathcomp.v
-field_tactics.v
-harmonic_numbers.v
-initial_conds.v
-lia_tactics.v
-ops_for_a.v
-ops_for_b.v
-ops_for_s.v
-ops_for_u.v
-ops_for_v.v
-punk.v
-rat_of_Z.v
-reduce_order.v
-s_props.v
-seq_defs.v
-shift.v
-test_conj.v
-test_field_tactics.v
-z3irrational.v
-z3seq_props.v
-rho_computations.v
-multinomial.v
-floor.v
-hanson_elem_arith.v
-hanson_elem_analysis.v
-hanson.v
+theories/a_props.v
+theories/annotated_recs_b.v
+theories/annotated_recs_c.v
+theories/annotated_recs_d.v
+theories/annotated_recs_s.v
+theories/annotated_recs_v.v
+theories/annotated_recs_z.v
+theories/algo_closures.v
+theories/arithmetics.v
+theories/b_over_a_props.v
+theories/b_props.v
+theories/bigopz.v
+theories/binomialz.v
+theories/c_props.v
+theories/conj.v
+theories/extra_cauchyreals.v
+theories/extra_mathcomp.v
+theories/field_tactics.v
+theories/harmonic_numbers.v
+theories/initial_conds.v
+theories/lia_tactics.v
+theories/ops_for_a.v
+theories/ops_for_b.v
+theories/ops_for_s.v
+theories/ops_for_u.v
+theories/ops_for_v.v
+theories/punk.v
+theories/rat_of_Z.v
+theories/reduce_order.v
+theories/s_props.v
+theories/seq_defs.v
+theories/shift.v
+theories/test_conj.v
+theories/test_field_tactics.v
+theories/z3irrational.v
+theories/z3seq_props.v
+theories/rho_computations.v
+theories/multinomial.v
+theories/floor.v
+theories/hanson_elem_arith.v
+theories/hanson_elem_analysis.v
+theories/hanson.v
 
 
 -R . mathcomp.apery