src/Pure/IsaMakefile

merged, resolving conflict in src/Pure/IsaMakefile concerning General/xml_data.ML;

#
# IsaMakefile for Pure
#

## targets

default: Pure
images: Pure
test: RAW Pure-ProofGeneral
all: images test


## global settings

SRC = $(ISABELLE_HOME)/src
OUT = $(ISABELLE_OUTPUT)
LOG = $(OUT)/log


## Pure

BOOTSTRAP_FILES = ML-Systems/bash.ML ML-Systems/compiler_polyml-5.0.ML	\
  ML-Systems/compiler_polyml-5.2.ML ML-Systems/compiler_polyml-5.3.ML	\
  ML-Systems/ml_name_space.ML ML-Systems/ml_pretty.ML			\
  ML-Systems/multithreading.ML ML-Systems/multithreading_polyml.ML	\
  ML-Systems/overloading_smlnj.ML ML-Systems/polyml-5.0.ML		\
  ML-Systems/polyml-5.1.ML ML-Systems/polyml-5.2.ML			\
  ML-Systems/polyml-5.2.1.ML ML-Systems/polyml.ML			\
  ML-Systems/polyml_common.ML ML-Systems/pp_polyml.ML			\
  ML-Systems/proper_int.ML ML-Systems/single_assignment.ML		\
  ML-Systems/single_assignment_polyml.ML ML-Systems/smlnj.ML		\
  ML-Systems/thread_dummy.ML ML-Systems/timing.ML			\
  ML-Systems/time_limit.ML ML-Systems/universal.ML			\
  ML-Systems/unsynchronized.ML

RAW: $(OUT)/RAW

$(OUT)/RAW: $(BOOTSTRAP_FILES)
	@./mk -r


Pure: $(OUT)/Pure

$(OUT)/Pure: $(BOOTSTRAP_FILES) Concurrent/cache.ML			\
  Concurrent/future.ML Concurrent/lazy.ML				\
  Concurrent/lazy_sequential.ML Concurrent/mailbox.ML			\
  Concurrent/par_list.ML Concurrent/par_list_sequential.ML		\
  Concurrent/simple_thread.ML Concurrent/single_assignment.ML		\
  Concurrent/single_assignment_sequential.ML				\
  Concurrent/synchronized.ML Concurrent/synchronized_sequential.ML	\
  Concurrent/task_queue.ML General/alist.ML General/antiquote.ML	\
  General/balanced_tree.ML General/basics.ML General/binding.ML		\
  General/buffer.ML General/exn.ML General/file.ML General/graph.ML	\
  General/heap.ML General/integer.ML General/long_name.ML		\
  General/markup.ML General/name_space.ML General/ord_list.ML		\
  General/output.ML General/path.ML General/position.ML			\
  General/pretty.ML General/print_mode.ML General/properties.ML		\
  General/queue.ML General/same.ML General/scan.ML General/sha1.ML	\
  General/sha1_polyml.ML General/secure.ML General/seq.ML		\
  General/source.ML General/stack.ML General/symbol.ML			\
  General/symbol_pos.ML General/table.ML General/url.ML General/xml.ML	\
  General/xml_data.ML General/yxml.ML Isar/args.ML Isar/attrib.ML	\
  Isar/auto_bind.ML Isar/calculation.ML Isar/class.ML			\
  Isar/class_target.ML Isar/code.ML Isar/constdefs.ML			\
  Isar/context_rules.ML Isar/element.ML Isar/expression.ML		\
  Isar/generic_target.ML Isar/isar_cmd.ML Isar/isar_document.ML		\
  Isar/isar_syn.ML Isar/keyword.ML Isar/local_defs.ML			\
  Isar/local_syntax.ML Isar/local_theory.ML Isar/locale.ML		\
  Isar/method.ML Isar/object_logic.ML Isar/obtain.ML			\
  Isar/outer_syntax.ML Isar/overloading.ML Isar/parse.ML		\
  Isar/parse_spec.ML Isar/parse_value.ML Isar/proof.ML			\
  Isar/proof_context.ML Isar/proof_display.ML Isar/proof_node.ML	\
  Isar/rule_cases.ML Isar/rule_insts.ML Isar/runtime.ML			\
  Isar/skip_proof.ML Isar/spec_rules.ML Isar/specification.ML		\
  Isar/theory_target.ML Isar/token.ML Isar/toplevel.ML			\
  Isar/typedecl.ML ML/ml_antiquote.ML ML/ml_compiler.ML			\
  ML/ml_compiler_polyml-5.3.ML ML/ml_context.ML ML/ml_env.ML		\
  ML/ml_lex.ML ML/ml_parse.ML ML/ml_syntax.ML ML/ml_thms.ML		\
  ML-Systems/install_pp_polyml.ML ML-Systems/install_pp_polyml-5.3.ML	\
  ML-Systems/use_context.ML Proof/extraction.ML PIDE/document.ML	\
  Proof/proof_rewrite_rules.ML Proof/proof_syntax.ML			\
  Proof/proofchecker.ML Proof/reconstruct.ML ProofGeneral/pgip.ML	\
  ProofGeneral/pgip_input.ML ProofGeneral/pgip_isabelle.ML		\
  ProofGeneral/pgip_markup.ML ProofGeneral/pgip_output.ML		\
  ProofGeneral/pgip_parser.ML ProofGeneral/pgip_tests.ML		\
  ProofGeneral/pgip_types.ML ProofGeneral/preferences.ML		\
  ProofGeneral/proof_general_emacs.ML General/yxml.ML Isar/args.ML	\
  Isar/attrib.ML Isar/auto_bind.ML Isar/calculation.ML Isar/class.ML	\
  Isar/class_target.ML Isar/code.ML Isar/constdefs.ML			\
  Isar/context_rules.ML Isar/element.ML Isar/expression.ML		\
  Isar/isar_cmd.ML Isar/isar_document.ML Isar/isar_syn.ML		\
  Isar/keyword.ML Isar/local_defs.ML Isar/local_syntax.ML		\
  Isar/local_theory.ML Isar/locale.ML Isar/method.ML			\
  Isar/object_logic.ML Isar/obtain.ML Isar/outer_syntax.ML		\
  Isar/overloading.ML Isar/parse.ML Isar/parse_spec.ML			\
  Isar/parse_value.ML Isar/proof.ML Isar/proof_context.ML		\
  Isar/proof_display.ML Isar/proof_node.ML Isar/rule_cases.ML		\
  Isar/rule_insts.ML Isar/runtime.ML Isar/skip_proof.ML			\
  Isar/spec_rules.ML Isar/specification.ML Isar/theory_target.ML	\
  Isar/token.ML Isar/toplevel.ML Isar/typedecl.ML ML/ml_antiquote.ML	\
  ML/ml_compiler.ML ML/ml_compiler_polyml-5.3.ML ML/ml_context.ML	\
  ML/ml_env.ML ML/ml_lex.ML ML/ml_parse.ML ML/ml_syntax.ML		\
  ML/ml_thms.ML ML-Systems/install_pp_polyml.ML				\
  ML-Systems/install_pp_polyml-5.3.ML ML-Systems/use_context.ML		\
  Proof/extraction.ML PIDE/document.ML Proof/proof_rewrite_rules.ML	\
  Proof/proof_syntax.ML Proof/proofchecker.ML Proof/reconstruct.ML	\
  ProofGeneral/pgip.ML ProofGeneral/pgip_input.ML			\
  ProofGeneral/pgip_isabelle.ML ProofGeneral/pgip_markup.ML		\
  ProofGeneral/pgip_output.ML ProofGeneral/pgip_parser.ML		\
  ProofGeneral/pgip_tests.ML ProofGeneral/pgip_types.ML			\
  ProofGeneral/preferences.ML ProofGeneral/proof_general_emacs.ML	\
  ProofGeneral/proof_general_pgip.ML Pure.thy ROOT.ML Syntax/ast.ML	\
  Syntax/lexicon.ML Syntax/mixfix.ML Syntax/parser.ML			\
  Syntax/printer.ML Syntax/simple_syntax.ML Syntax/syn_ext.ML		\
  Syntax/syn_trans.ML Syntax/syntax.ML Syntax/type_ext.ML		\
  System/isabelle_process.ML System/isar.ML System/session.ML		\
  Thy/html.ML Thy/latex.ML Thy/present.ML Thy/term_style.ML		\
  Thy/thm_deps.ML Thy/thy_header.ML Thy/thy_info.ML Thy/thy_load.ML	\
  Thy/thy_output.ML Thy/thy_syntax.ML Tools/find_consts.ML		\
  Tools/find_theorems.ML Tools/named_thms.ML Tools/xml_syntax.ML	\
  assumption.ML axclass.ML codegen.ML config.ML conjunction.ML		\
  consts.ML context.ML context_position.ML conv.ML defs.ML display.ML	\
  drule.ML envir.ML facts.ML goal.ML goal_display.ML interpretation.ML	\
  item_net.ML library.ML logic.ML meta_simplifier.ML more_thm.ML	\
  morphism.ML name.ML net.ML old_goals.ML old_term.ML pattern.ML	\
  primitive_defs.ML proofterm.ML pure_setup.ML pure_thy.ML search.ML	\
  sign.ML simplifier.ML sorts.ML subgoal.ML tactic.ML tactical.ML	\
  term.ML term_ord.ML term_subst.ML theory.ML thm.ML type.ML		\
  type_infer.ML unify.ML variable.ML
	@./mk


## Proof General keywords

Pure-ProofGeneral: Pure $(LOG)/Pure-ProofGeneral.gz

$(LOG)/Pure-ProofGeneral.gz: $(OUT)/Pure ProofGeneral/proof_general_keywords.ML
	@$(ISABELLE_TOOL) usedir -f proof_general_keywords.ML $(OUT)/Pure ProofGeneral


## clean

clean:
	@rm -f $(OUT)/Pure $(LOG)/Pure.gz $(OUT)/RAW $(LOG)/RAW.gz \
          $(LOG)/Pure-ProofGeneral.gz