summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--otherlibs/graph/Makefile13
-rw-r--r--otherlibs/num/Makefile5
-rw-r--r--otherlibs/str/Makefile5
-rw-r--r--otherlibs/unix/Makefile5
4 files changed, 22 insertions, 6 deletions
diff --git a/otherlibs/graph/Makefile b/otherlibs/graph/Makefile
index f4591d98a..c52265b55 100644
--- a/otherlibs/graph/Makefile
+++ b/otherlibs/graph/Makefile
@@ -3,7 +3,7 @@
include ../../Makefile.config
CC=$(BYTECC)
-CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS)
+CFLAGS=-I../../byterun -I$(X11_INCLUDES) -O $(BYTECCCOMPOPTS)
CAMLC=../../boot/cslrun ../../boot/cslc -I ../../boot
@@ -12,6 +12,8 @@ OBJS=open.o draw.o fill.o color.o text.o \
all: libgraph.a graphics.cmi graphics.cma
+allopt:
+
libgraph.a: $(OBJS)
rm -f libgraph.a
ar rc libgraph.a $(OBJS)
@@ -20,14 +22,19 @@ libgraph.a: $(OBJS)
graphics.cma: graphics.cmo
$(CAMLC) -a -o graphics.cma graphics.cmo
-clean::
- rm -f libgraph.a $(GENFILES) *.o *.cm[ioa]
+clean:
+ rm -f *.cm*
+
+realclean: clean
+ rm -f *.a *.o $(GENFILES)
install:
cp libgraph.a $(LIBDIR)/libgraph.a
cd $(LIBDIR); $(RANLIB) libgraph.a
cp graphics.cm[ia] $(LIBDIR)
+installopt:
+
.SUFFIXES: .ml .mli .cmo .cmi
.mli.cmi:
diff --git a/otherlibs/num/Makefile b/otherlibs/num/Makefile
index eaa3270cc..4264d9bab 100644
--- a/otherlibs/num/Makefile
+++ b/otherlibs/num/Makefile
@@ -43,7 +43,10 @@ installopt:
cd $(LIBDIR); $(RANLIB) nums.a
clean:
- rm -f *.a *.o *.cm*
+ rm -f *.cm*
+
+realclean: clean
+ rm -f *.a *.o
rm -f nat.ml int_misc.ml
cd bignum; make scratch
cd test; make clean
diff --git a/otherlibs/str/Makefile b/otherlibs/str/Makefile
index fd67a7e55..d67416cef 100644
--- a/otherlibs/str/Makefile
+++ b/otherlibs/str/Makefile
@@ -29,7 +29,10 @@ $(REGEXLIB)/regex.o: $(REGEXLIB)/regex.c $(REGEXLIB)/regex.h
cd $(REGEXLIB); CC="$(CC)" sh configure; make
clean:
- rm -f libstr.a *.o *.cm* cslstr
+ rm -f *.cm*
+
+realclean: clean
+ rm -f *.a *.o
cd $(REGEXLIB); if test -f Makefile; then make distclean; else exit 0; fi
install:
diff --git a/otherlibs/unix/Makefile b/otherlibs/unix/Makefile
index 01bb298ea..aed6ba612 100644
--- a/otherlibs/unix/Makefile
+++ b/otherlibs/unix/Makefile
@@ -39,7 +39,10 @@ unix.cmxa: unix.cmx
$(CAMLOPT) -a -o unix.cmxa unix.cmx
clean:
- rm -f libunix.a *.o *.cm*
+ rm -f *.cm*
+
+realclean: clean
+ rm -f *.a *.o
install:
cp libunix.a $(LIBDIR)/libunix.a