From 3a5b584ff6698dbb682e5f7e96386791341fa733 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Tue, 19 Feb 2008 10:49:12 +0100
Subject: [PATCH] Makefile(s): swapped old/new.

---
 Makefile     | 85 ++++++++++++++++++++++++++++++++++++++++++++--------
 Makefile.old | 85 +++++++---------------------------------------------
 2 files changed, 84 insertions(+), 86 deletions(-)

diff --git a/Makefile b/Makefile
index 5ca79fb..dc00884 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,75 @@
-RESULT=justnukeit
-SOURCES=\
-		Position.ml \
-		Maze.ml \
-		Player.ml \
-		main.ml
-LIBS=bigarray sdl unix
-INCDIRS=+sdl
-LIBDIRS=+sdl
-OCAMLFLAGS=-w A -g -thread
+PROGRAMS=justnukeit
 
-all: native-code
+justnukeit_OBJS=Position.cmx Maze.cmx Player.cmx main.cmx
+justnukeit_INCS=sdl
+justnukeit_LIBS=graphics.cmxa unix.cmxa threads.cmxa bigarray.cmxa sdl.cmxa
+
+MODULES=$(patsubst %.mli,%,$(wildcard *.mli)) $(patsubst %.ml,%,$(wildcard *.ml))
+
+CMI=$(patsubst %.ml,%.cmi,$(MODULES:=.ml))
+CMO=$(patsubst %.ml,%.cmo,$(MODULES:=.ml))
+CMX=$(patsubst %.ml,%.cmx,$(MODULES:=.ml))
+
+OCAMLDEP=ocamldep
+OCAMLOPT=ocamlopt
+OCAMLC=ocamlc
+
+OPTS=-w A -g -thread -I +sdl -ccopt -L+sdl
+
+define PROGRAM_template
+ALL_OBJS   += $$($(1)_OBJS)
+$(1): $$($(1)_OBJS)
+	@echo -n -e "\x1B[31;1m"
+	@echo "[L] $@"
+	@echo -n -e "\x1B[0m"
+	$(OCAMLOPT) $(OPTS) $($(1)_LIBS) $($(1)_OBJS) -o $(1)
+	@echo ""
+endef
+
+$(foreach prog,$(PROGRAMS),$(eval $(call PROGRAM_template,$(prog))))
+
+.PHONY: all
+all: $(PROGRAMS)
+
+%.cmi: %.mli
+	@echo -n -e "\x1B[31;1m"
+	@echo "[I] $<"
+	@echo -n -e "\x1B[0m"
+	$(OCAMLOPT) $(OPTS) -i $<
+	$(OCAMLOPT) $(OPTS) -c $<
+	@echo ""
+
+%.cmx: %.ml
+	@echo -n -e "\x1B[31;1m"
+	@echo "[C] $<"
+	@echo -n -e "\x1B[0m"
+	$(OCAMLOPT) $(OPTS) -i $<
+	$(OCAMLOPT) $(OPTS) -c $<
+	@echo ""
+
+%.cmo %.cmi: %.ml %.cmi %.mli
+	@echo "[O] $<"
+	$(OCAMLC) $(OPTS) -i $<
+	$(OCAMLC) $(OPTS) -c $<
+	echo ""
+
+%.cmo %.cmi: %.ml
+	@echo -n -e "\x1B[31;1m"
+	@echo "[O] $<"
+	@echo -n -e "\x1B[0m"
+	$(OCAMLC) $(OPTS) -i $<
+	$(OCAMLC) $(OPTS) -c $<
+	echo ""
+
+clean:
+	rm -f $(PROGRAMS) *~ *.cm* *.o *.a *.so .depend *.cmxa *.cma
+
+.depend: $(MODULES:=.ml)
+	$(OCAMLDEP) $(MODULES:=.ml) $(MODULES:=.mli) > .depend
+	@echo ""
+
+
+.SUFFIXES:
+
+-include .depend
 
--include OCamlMakefile
diff --git a/Makefile.old b/Makefile.old
index d32fdc1..5ca79fb 100644
--- a/Makefile.old
+++ b/Makefile.old
@@ -1,77 +1,14 @@
-PROGRAMS=justnukeit
-
-justnukeit_OBJS=Position.cmx Maze.cmx Player.cmx main.cmx
-justnukeit_LIBS=graphics.cmxa unix.cmxa threads.cmxa bigarray.cmxa sdl.cmxa
-
-MODULES=$(patsubst %.mli,%,$(wildcard *.mli)) $(patsubst %.ml,%,$(wildcard *.ml))
-
-CMI=$(patsubst %.ml,%.cmi,$(MODULES:=.ml))
-CMO=$(patsubst %.ml,%.cmo,$(MODULES:=.ml))
-CMX=$(patsubst %.ml,%.cmx,$(MODULES:=.ml))
-LIB=
+RESULT=justnukeit
+SOURCES=\
+		Position.ml \
+		Maze.ml \
+		Player.ml \
+		main.ml
+LIBS=bigarray sdl unix
 INCDIRS=+sdl
+LIBDIRS=+sdl
+OCAMLFLAGS=-w A -g -thread
 
-OCAMLDEP=ocamlfind ocamldep
-OCAMLOPT=ocamlfind ocamlopt
-OCAMLC=ocamlfind ocamlc
-
-OPTS=-w A -g -thread -Isdl
-
-define PROGRAM_template
-ALL_OBJS   += $$($(1)_OBJS)
-$(1): $$($(1)_OBJS)
-	@echo -n -e "\x1B[31;1m"
-	@echo "[L] $@"
-	@echo -n -e "\x1B[0m"
-	$(OCAMLOPT) $(OPTS) $($(1)_LIBS) $($(1)_OBJS) -o $(1)
-	@echo ""
-endef
-
-$(foreach prog,$(PROGRAMS),$(eval $(call PROGRAM_template,$(prog))))
-
-.PHONY: all
-all: $(PROGRAMS)
-
-%.cmi: %.mli
-	@echo -n -e "\x1B[31;1m"
-	@echo "[I] $<"
-	@echo -n -e "\x1B[0m"
-	@$(OCAMLC) -i $<
-	#@$(OCAMLC) $(OPTS) -c $<
-	@$(OCAMLOPT) $(OPTS) -c $<
-	@echo ""
-
-%.cmx: %.ml
-	@echo -n -e "\x1B[31;1m"
-	@echo "[C] $<"
-	@echo -n -e "\x1B[0m"
-	@$(OCAMLOPT) $(OPTS) -i $<
-	@$(OCAMLOPT) $(OPTS) -c $<
-	@echo ""
-
-%.cmo %.cmi: %.ml %.cmi %.mli
-	@echo "[O] $<"
-	@$(OCAMLC) -i $<
-	@$(OCAMLC) $(OPTS) -c $<
-	echo ""
-
-%.cmo %.cmi: %.ml
-	@echo -n -e "\x1B[31;1m"
-	@echo "[O] $<"
-	@echo -n -e "\x1B[0m"
-	@$(OCAMLC) -i $<
-	@$(OCAMLC) $(OPTS) -c $<
-	echo ""
-
-clean:
-	rm -f $(PROGRAMS) *~ *.cm* *.o *.a *.so .depend *.cmxa *.cma
-
-.depend: $(MODULES:=.ml)
-	$(OCAMLDEP) $(MODULES:=.ml) $(MODULES:=.mli) > .depend
-	@echo ""
-
-
-.SUFFIXES:
-
--include .depend
+all: native-code
 
+-include OCamlMakefile