summaryrefslogtreecommitdiffstats
path: root/otherlibs
diff options
context:
space:
mode:
authorJun FURUSE / 古瀬 淳 <jun.furuse@gmail.com>2003-08-29 14:08:21 +0000
committerJun FURUSE / 古瀬 淳 <jun.furuse@gmail.com>2003-08-29 14:08:21 +0000
commita0de3805d57c36af4db87c83ba26322f231220b1 (patch)
tree6e876e8ca2b9843b5f96656452b143a6a675c626 /otherlibs
parent7766d0cd96efc80d39aa525f86f966b374abc3a5 (diff)
now make clean calls (camltk|labltk)/Makefile.gen, instead of Makefile
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5810 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs')
-rw-r--r--otherlibs/labltk/Makefile7
-rw-r--r--otherlibs/labltk/camltk/Makefile1
-rw-r--r--otherlibs/labltk/camltk/Makefile.gen4
-rw-r--r--otherlibs/labltk/labltk/Makefile1
-rw-r--r--otherlibs/labltk/labltk/Makefile.gen4
5 files changed, 10 insertions, 7 deletions
diff --git a/otherlibs/labltk/Makefile b/otherlibs/labltk/Makefile
index 9e89adc03..4e4fbd159 100644
--- a/otherlibs/labltk/Makefile
+++ b/otherlibs/labltk/Makefile
@@ -1,7 +1,9 @@
# Top Makefile for mlTk
SUBDIRS=compiler support lib jpf frx tkanim examples_labltk \
- camltk labltk examples_camltk browser
+ examples_camltk browser
+SUBDIRS_GENERATED=camltk labltk
+
all:
cd support; $(MAKE)
@@ -71,5 +73,8 @@ partialclean clean:
for d in $(SUBDIRS); do \
cd $$d; $(MAKE) -f Makefile clean; cd ..; \
done
+ for d in $(SUBDIRS_GENERATED); do \
+ cd $$d; $(MAKE) -f Makefile.gen clean; cd ..; \
+ done
depend:
diff --git a/otherlibs/labltk/camltk/Makefile b/otherlibs/labltk/camltk/Makefile
index b00ed91e2..afa6f3af2 100644
--- a/otherlibs/labltk/camltk/Makefile
+++ b/otherlibs/labltk/camltk/Makefile
@@ -19,7 +19,6 @@ camltkobjsx: $(CAMLTKOBJSX)
clean:
$(MAKE) -f Makefile.gen clean
- -rm -f .depend
install: $(CAMLTKOBJS)
if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
diff --git a/otherlibs/labltk/camltk/Makefile.gen b/otherlibs/labltk/camltk/Makefile.gen
index 01c633a37..1e4f50a10 100644
--- a/otherlibs/labltk/camltk/Makefile.gen
+++ b/otherlibs/labltk/camltk/Makefile.gen
@@ -41,6 +41,6 @@ cTk.ml camltk.ml .depend: _tkgen.ml ../builtin/report.ml ../compiler/pp #../buil
# All .{ml,mli} files are generated in this directory
clean:
- rm -f *.cm* *.ml *.mli *.o *.a
+ rm -f *.cm* *.ml *.mli *.o *.a .depend
-# rm -f modules .depend
+# rm -f modules
diff --git a/otherlibs/labltk/labltk/Makefile b/otherlibs/labltk/labltk/Makefile
index 542d350bd..53276dd16 100644
--- a/otherlibs/labltk/labltk/Makefile
+++ b/otherlibs/labltk/labltk/Makefile
@@ -27,7 +27,6 @@ installopt: $(LABLTKOBJSX)
clean:
$(MAKE) -f Makefile.gen clean
- -rm -f .depend
.SUFFIXES :
.SUFFIXES : .mli .ml .cmi .cmx .cmo .mlp
diff --git a/otherlibs/labltk/labltk/Makefile.gen b/otherlibs/labltk/labltk/Makefile.gen
index 20891d156..a7f85082e 100644
--- a/otherlibs/labltk/labltk/Makefile.gen
+++ b/otherlibs/labltk/labltk/Makefile.gen
@@ -40,6 +40,6 @@ tk.ml labltk.ml .depend: _tkgen.ml ../builtin/report.ml ../compiler/pp #../built
# All .{ml,mli} files are generated in this directory
clean:
- rm -f *.cm* *.ml *.mli *.o *.a
+ rm -f *.cm* *.ml *.mli *.o *.a .depend
-# rm -f modules .depend
+# rm -f modules