The unified diff between revisions [f9bf0ab9..] and [23b40306..] is displayed below. It can also be downloaded as a raw diff.
This diff has been restricted to the following files: 'Makefile'
#
#
# patch "Makefile"
# from [d406a10c5a4add07e2a63a3926e1f8ec5134c2df]
# to [8d9be147e120edee1e1f374afa26429f8cf3a40f]
#
============================================================
--- Makefile d406a10c5a4add07e2a63a3926e1f8ec5134c2df
+++ Makefile 8d9be147e120edee1e1f374afa26429f8cf3a40f
@@ -4,15 +4,14 @@ EXTLIB := extlib-1.3
OCAMLNET := ocamlnet-0.97.1
EXTLIB := extlib-1.3
-VPATH = mlsqlite $(OCAMLNET) $(EXTLIB) glib crypto
+VPATH = glib crypto
-MLINCDIRS = -I $(OCAMLNET) -I mlsqlite -I $(EXTLIB) -I $(LABLGTK_DIR) -I glib -I crypto
+MLINCDIRS = -I $(LABLGTK_DIR) -I glib -I crypto
GTK_CFLAGS := $(shell pkg-config gtk+-2.0 --cflags)
GNOMECANVAS_CFLAGS := $(shell pkg-config libgnomecanvas-2.0 --cflags)
-SRC = base64.ml base64.mli sqlite3.ml sqlite3.mli IO.mli IO.ml unzip.ml unzip.mli \
- gspawn.ml gspawn.mli giochannel.ml giochannel.mli \
+SRC = gspawn.ml gspawn.mli giochannel.ml giochannel.mli \
crypto.ml crypto.mli \
viz_misc.ml viz_misc.mli viz_types.ml viz_types.mli \
q.ml q.mli heap.ml heap.mli \
@@ -25,8 +24,7 @@ SRC = base64.ml base64.mli sqlite3.ml sq
icon.ml unidiff.ml unidiff.mli \
view.ml view.mli ui.ml main.ml
-C_OBJ = mlsqlite/ocaml-sqlite3.o \
- glib/ocaml-gspawn.o glib/ocaml-giochannel.o \
+C_OBJ = glib/ocaml-gspawn.o glib/ocaml-giochannel.o \
crypto/ocaml-openssl.o \
gnomecanvas_hack.o
@@ -42,44 +40,35 @@ DISTSRC = Makefile configure.ac config.m
dot_types.mli dot_lexer.mll dot_parser.mly \
subprocess.ml subprocess.mli icon.ml status.ml ui.ml \
revision_types.mli revision_lexer.mll revision_parser.mly \
- components.ml database.ml database.mli agraph.ml agraph.mli \
+ components.ml git.ml database.mli agraph.ml agraph.mli \
unidiff.ml unidiff.mli gnomecanvas_hack.c view.ml view.mli main.ml \
- mlsqlite/sqlite3.ml mlsqlite/sqlite3.mli mlsqlite/ocaml-sqlite3.c \
- ocamlnet-0.97.1/base64.ml ocamlnet-0.97.1/base64.mli ocamlnet-0.97.1/LICENSE \
- extlib-1.3/IO.ml extlib-1.3/IO.mli extlib-1.3/unzip.ml extlib-1.3/unzip.mli \
glib/gspawn.ml glib/gspawn.mli glib/giochannel.ml glib/giochannel.mli \
glib/ocaml-gspawn.c glib/ocaml-giochannel.c \
glib/gspawn_tags.var glib/giochannel_tags.var \
crypto/ocaml-openssl.c crypto/crypto.ml crypto/crypto.mli
-ifdef SQLITE_LIBS
LIB3RDPARTY_OBJ = $(C_OBJ)
-SQLITE_LINK = -ccopt "$(SQLITE_LIBS)"
-else
-LIB3RDPARTY_OBJ = $(MONOTONE_DIR)/sqlite/lib3rdparty_a-*.o $(C_OBJ)
-endif
ifeq ($(OCAMLBEST), opt)
-monotone-viz : $(OBJX) lib3rdparty.a
- $(OCAMLOPT) -o $@ -I . -I $(LABLGTK_DIR) $(MLLIBS) $^ $(CRYPTO_LIB) $(SQLITE_LINK)
-monotone-viz : MLLIBS = str.cmxa lablgtk.cmxa gtkInit.cmx lablgnomecanvas.cmxa
+git-viz: $(OBJX) lib3rdparty.a
+ $(OCAMLOPT) -o $@ -I . -I $(LABLGTK_DIR) $(MLLIBS) $^ $(CRYPTO_LIB)
+git-viz : MLLIBS = str.cmxa lablgtk.cmxa gtkInit.cmx lablgnomecanvas.cmxa
else
-monotone-viz : $(OBJ) lib3rdparty.a
- $(OCAMLC) -custom -o $@ -I . -I $(LABLGTK_DIR) $(MLLIBS) $^ $(CRYPTO_LIB) $(SQLITE_LINK)
-monotone-viz : MLLIBS = str.cma lablgtk.cma gtkInit.cmo lablgnomecanvas.cma
+git-viz:
+ ln -sf git.ml database.ml
+ $(OCAMLC) -custom -o $@ -I . -I $(LABLGTK_DIR) $(MLLIBS) $^ $(CRYPTO_LIB)
+git-viz : MLLIBS = str.cma lablgtk.cma gtkInit.cmo lablgnomecanvas.cma
endif
+database.ml :
+ ln -s git.ml $@
+
lib3rdparty.a : $(C_OBJ)
ar crs lib3rdparty.a $(LIB3RDPARTY_OBJ)
glib/ocaml-gspawn.o : gspawn_tags.c gspawn_tags.h
glib/ocaml-giochannel.o : giochannel_tags.c giochannel_tags.h
glib/ocaml-%.o : CINCDIRS = -I $(LABLGTK_DIR) -ccopt "$(GTK_CFLAGS)"
-ifdef SQLITE_LIBS
-mlsqlite/ocaml-sqlite3.o : CINCDIRS = -ccopt "$(SQLITE_CFLAGS)"
-else
-mlsqlite/ocaml-sqlite3.o : CINCDIRS = -I $(MONOTONE_DIR)/sqlite
-endif
crypto/ocaml-openssl.o : CINCDIRS = -ccopt "$(CRYPTO_CFLAGS)"
gnomecanvas_hack.o : CINCDIRS = -ccopt "$(GNOMECANVAS_CFLAGS)"
@@ -110,9 +99,6 @@ clean :
rm -f *.a *.so *.o *.cm* monotone-viz
rm -f dot_lexer.ml dot_parser.ml dot_parser.mli
rm -f revision_lexer.ml revision_parser.ml revision_parser.mli
- cd mlsqlite && rm -f *.a *.so *.o *.cm*
- cd $(OCAMLNET) && rm -f *.o *.cm*
- cd $(EXTLIB) && rm -f *.o *.cm*
cd glib && rm -f *.o *.cm*
cd crypto && rm -f *.o *.cm*