combined env prims again and reorganized the project to have a lib folder

diff --git a/Makefile b/Makefile
index 67bab47296900df8c46c06f9de3e472d5048dcbd..dffd7984d8eec6791c4aaadc3c2ac92a1b028edb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ else
     MKLIBFLAGS =
     OBJEXT     = cmo
     LIBEXT     = cma
-    OLDFLAGS   =
+    OLDFLAGS   = -dllpath .
 endif
 
 # Target Definitions
@@ -26,20 +26,22 @@ all: tide
 
 clean:
        $(RM) tide *.cm* *.o *.a *.so
+       $(RM) tide lib/*.cm* lib/*.o
 
-env.$(LIBEXT): env.$(OBJEXT) env_set.o env_get.o env_unset.o
+env.$(LIBEXT): lib/env.$(OBJEXT) lib/env_prims.o
 tide: env.$(LIBEXT) tide.$(OBJEXT)
 
 # Implicit Rule Definitions
 #-------------------------------------------------------------------------------
 %:
-       $(OC) $(OLDFLAGS) -o $@ $^ -I .
+       $(OC) $(OLDFLAGS) -o $@ $^ -I . -I lib
 
 %.$(LIBEXT):
        $(MKLIB) $(MKLIBFLAGS) $(OCFLAGS) -o $* -oc $* $^
 
 %.$(OBJEXT): %.ml
-       $(OC) $(OCFLAGS) -c -o $@ $^
+       $(OC) $(OCFLAGS) -c -o $@ $^ -I lib
 
 %.o: %.c
-       $(OC) $(OCFLAGS) -c -o $@ $^
+       $(OC) $(OCFLAGS) -c $^
+       mv $(notdir $@) $(dir $@)

diff --git a/env_get.c b/env_get.c
deleted file mode 100644 (file)
index 2f6f427..0000000
--- a/env_get.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <curses.h>
-#include <caml/mlvalues.h>
-#include <caml/memory.h>
-#include <caml/alloc.h>
-#include <caml/custom.h>
-#include <stdlib.h>
-
-CAMLprim value env_get(value var) {
-    CAMLparam1(var);
-    puts("bar");
-    CAMLreturn(caml_copy_string(""));
-}

diff --git a/env_unset.c b/env_unset.c
deleted file mode 100644 (file)
index 88646ef..0000000
--- a/env_unset.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <curses.h>
-#include <caml/mlvalues.h>
-#include <caml/memory.h>
-#include <caml/alloc.h>
-#include <caml/custom.h>
-#include <stdlib.h>
-
-CAMLprim value env_unset(value var) {
-    CAMLparam1(var);
-    puts("baz");
-    CAMLreturn(Val_int(0));
-}

diff --git a/env.ml b/lib/env.ml
similarity index 100%
rename from env.ml
rename to lib/env.ml

diff --git a/env_set.c b/lib/env_prims.c
similarity index 54%
rename from env_set.c
rename to lib/env_prims.c
index 5c0a9d59d39146701dbbdad4b59273e265f3afa7..f08dfaec6969de392e6befc2df5fe7af70d99801 100644 (file)
--- a/env_set.c
+++ b/lib/env_prims.c
@@ -5,8 +5,20 @@
 #include <caml/custom.h>
 #include <stdlib.h>
 
+CAMLprim value env_get(value var) {
+    CAMLparam1(var);
+    puts("bar");
+    CAMLreturn(caml_copy_string(""));
+}
+
 CAMLprim value env_set(value var, value val) {
     CAMLparam2(var, val);
     puts("foo");
     CAMLreturn(Val_int(0));
 }
+
+CAMLprim value env_unset(value var) {
+    CAMLparam1(var);
+    puts("baz");
+    CAMLreturn(Val_int(0));
+}