[Pkg-ocaml-maint-commits] [SCM] mikmatch packaging branch, master, updated. debian/1.0.4-1-6-gdb3fff3

[Hendrik Tews]

The following commit has been merged in the master branch:
commit 92483131675202b6f0144d6b5fb4e51ba7af4b2e
Author: Hendrik Tews <hendrik at askra.de>
Date:   Mon Jun 10 16:32:35 2013 +0200

    unapply patch

diff --git a/Makefile b/Makefile
index baf1dda..5f399cb 100644
--- a/Makefile
+++ b/Makefile
@@ -19,10 +19,8 @@ uninstall: uninstall-pcre
 ## GODIVA/GODI targets
 all: common
 	cd pcre && $(MAKE) all-bc
-	cd str && $(MAKE) all-bc
 opt: common
 	cd pcre && $(MAKE) all-nc
-	cd str && $(MAKE) all-nc
 
 ## end of GODIVA targets
 
diff --git a/str/Makefile b/str/Makefile
index 3940239..658cb3d 100644
--- a/str/Makefile
+++ b/str/Makefile
@@ -24,30 +24,21 @@ INCDIRS = ../common
 
 USE_CAMLP4 = yes
 
-COMMON_LIBINSTALL_FILES := \
+LIBINSTALL_FILES := \
   pa_mikmatch_str.cma pa_mikmatch_str.cmo pa_mikmatch_str.cmi \
-  run_mikmatch_str.cmi \
-  mikmatch.cmi mikmatch.mli 
-BC_LIBINSTALL_FILES := \
-  run_mikmatch_str.cma run_mikmatch_str.cmo mikmatch.cmo
-NC_LIBINSTALL_FILES := \
-  mikmatch.cmx \
+  run_mikmatch_str.cma run_mikmatch_str.cmo run_mikmatch_str.cmi \
+  mikmatch.cmi mikmatch.cmo mikmatch.cmx mikmatch.mli \
   run_mikmatch_str.cmxa run_mikmatch_str.cmx \
   run_mikmatch_str.a run_mikmatch_str.o
-ALL_LIBINSTALL_FILES := \
-  $(COMMON_LIBINSTALL_FILES) $(BC_LIBINSTALL_FILES) $(NC_LIBINSTALL_FILES)
 
 .PHONY: default force all links 
 
-default: all-nc all-bc
+default: version links pa_lib misc
 force:
 	touch $(SOURCES)
 	$(MAKE)
 
-all-bc: version links pa_lib misc-bc
-	touch bytecode
-all-nc: version links pa_lib misc-nc
-	touch nativecode
+all:
 
 links: mikmatch.mli mikmatch.ml match.ml syntax_common.ml mm_util.ml \
 	global_def.mli global_def.ml
@@ -67,20 +58,13 @@ global_def.mli: ../common/global_def.mli
 global_def.ml: ../common/global_def.ml
 	ln -s $< $@
 
-.PHONY: pa_lib install uninstall version topinstall misc all-nc all-bc \
-	      misc-bc misc-nc
+.PHONY: pa_lib install uninstall version topinstall misc
 
 pa_lib:
 	$(MAKE) RESULT=pa_mikmatch_str pabc bcl
 
 #install: libinstall topinstall
-install: 
-	if test -f nativecode; \
-	then \
-		$(MAKE) "LIBINSTALL_FILES=$(ALL_LIBINSTALL_FILES)" libinstall;\
-	else \
-		$(MAKE) "LIBINSTALL_FILES=$(COMMON_LIBINSTALL_FILES) $(BC_LIBINSTALL_FILES)" libinstall; \
-	fi
+install: libinstall
 uninstall: libuninstall
 	rm -f $(BINDIR)/mikmatch_str.top $(BINDIR)/mikmatch_str
 
@@ -90,12 +74,10 @@ version:
 topinstall:
 	install -m 0755 mikmatch_str.top mikmatch_str $(BINDIR)
 
-misc-bc:
+misc:
 	ocamlc -c mikmatch.mli
 	ocamlc -a -o run_mikmatch_str.cma \
 		mikmatch.ml run_mikmatch_str.ml
-
-misc-nc: misc-bc
 	ocamlopt -a -o run_mikmatch_str.cmxa \
 		mikmatch.ml run_mikmatch_str.ml
 
@@ -128,8 +110,7 @@ test-install:
 
 TRASH = \
  *~ *.ppo *.cm[ioxa] *.cmxa *.o *.a *.top \
- *.test test1 test1.more mikmatch_str mikmatch_str.ml \
- bytecode nativecode
+ *.test test1 test1.more mikmatch_str mikmatch_str.ml
 
 
 OCAMLMAKEFILE = ../OCamlMakefile

-- 
mikmatch packaging