diff --git a/Makefile b/Makefile index e4c5dcf11ad0fd4cbaa0dda0e2dc33acc1360d3d..6931e3e27f0b115fd68a598e7513f3d988ceec83 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,6 @@ # This file is the main makefile of Frama-C. -FRAMAC_SRC=. MAKECONFIG_DIR=share include share/Makefile.common diff --git a/share/Makefile.common b/share/Makefile.common index 0d327c79658ee9e513bb8a3d1c3508dbed26a003..b265ec7bc7a88fdb88acee948fc9b65de273675f 100644 --- a/share/Makefile.common +++ b/share/Makefile.common @@ -26,11 +26,9 @@ # # ########################################################################## -include $(MAKECONFIG_DIR)/Makefile.config - -################## +################# # Make commands # -################## +################# define assert_defined ifndef $(1) @@ -38,15 +36,15 @@ $$(error Undefined variable $(1) please report.) endif endef -###################### -# Required variables # -###################### +################################## +# Configure & required variables # +################################## -$(eval $(call assert_defined,PLATFORM)) +$(eval $(call assert_defined,MAKECONFIG_DIR)) -################## -# Flags # -################## +include $(MAKECONFIG_DIR)/Makefile.config + +$(eval $(call assert_defined,PLATFORM)) ############# # Verbosing # @@ -78,7 +76,6 @@ else MAKE := MAKEFLAGS="$(OLDFLAGS)" $(MAKE) endif - ################## # Shell commands # ################## @@ -119,53 +116,6 @@ else TAR = tar endif -########################### -# Command pretty printing # -########################### - -PRINT_OCAMLC =$(PRINT) 'Ocamlc '# -PRINT_OCAMLOPT =$(PRINT) 'Ocamlopt '# -PRINT_DEP =$(PRINT) 'Ocamldep '# -PRINT_OCAMLLEX =$(PRINT) 'Ocamllex '# -PRINT_OCAMLYACC =$(PRINT) 'Ocamlyacc '# -PRINT_OCAMLMKTOP=$(PRINT) 'Ocamlmktop '# -PRINT_DOC =$(PRINT) 'Ocamldoc '# -PRINT_OCAMLCP =$(PRINT) 'Profiling '# -PRINT_CAMLP4 =$(PRINT) 'Camlp4 '# -PRINT_PACKING =$(PRINT) 'Packing '# -PRINT_LINKING =$(PRINT) 'Linking '# -PRINT_INFERRING =$(PRINT) 'Inferring '# -PRINT_CC =$(PRINT) 'CC '# - -PRINT_MAKING =$(PRINT) 'Generating '# -PRINT_MV =$(PRINT) 'Moving to '# -PRINT_CP =$(PRINT) 'Copying to '# -PRINT_RM =$(PRINT) 'Cleaning '# -PRINT_EXEC =$(PRINT) 'Running '# -PRINT_TAR =$(PRINT) 'Archiving '# -PRINT_UNTAR =$(PRINT) 'Unarchiving '# -PRINT_CONFIG =$(PRINT) 'Configuring '# -PRINT_BUILD =$(PRINT) 'Building '# -PRINT_INSTALL =$(PRINT) 'Installing '# -PRINT_UPDATE =$(PRINT) 'Updating '# - -PRINT_DOT =$(PRINT) 'Dot '# -PRINT_LATEX =$(PRINT) 'Latex '# -PRINT_DVIPS =$(PRINT) 'Dvips '# -PRINT_HEVEA =$(PRINT) 'Hevea '# - -######### -# Tests # -######### - -################# -# Documentation # -################# - -########################## -# Plugin File Generation # -########################## - ########################################################################## # Local Variables: # compile-command: "make"