The unified diff between revisions [7891617d..] and [78746ed3..] 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 [473b5d39237dbd706049a1879888aea2f93b957b]
# to [e24ee4ebcb8c535231a27e69c5bab89976e9b9d8]
#
============================================================
--- Makefile 473b5d39237dbd706049a1879888aea2f93b957b
+++ Makefile e24ee4ebcb8c535231a27e69c5bab89976e9b9d8
@@ -10,8 +10,8 @@ MLINCDIRS = -I $(LABLGTK_DIR) -I glib -I
VPATH = glib crypto
MLINCDIRS = -I $(LABLGTK_DIR) -I glib -I crypto
-CINCDIRS = -I $(LABLGTK_DIR) -ccopt "$(GTK_CFLAGS) $(CRYPTO_CFLAGS)"
GTK_CFLAGS := $(shell pkg-config gtk+-2.0 --cflags)
+GNOMECANVAS_CFLAGS := $(shell pkg-config libgnomecanvas-2.0 --cflags)
SRC = gspawn.ml gspawn.mli giochannel.ml giochannel.mli \
@@ -27,6 +27,10 @@ SRC = gspawn.ml gspawn.mli giochannel.ml
icon.ml unidiff.ml unidiff.mli \
view.ml view.mli ui.ml main.ml
+C_OBJ = glib/ocaml-gspawn.o glib/ocaml-giochannel.o \
+ crypto/ocaml-openssl.o \
+ gnomecanvas_hack.o
+
USE_P4 = viz_style.ml
OBJ = $(patsubst %.ml,%.cmo,$(filter %.ml, $(SRC)))
@@ -61,11 +65,14 @@ database.ml :
database.ml :
ln -s git.ml $@
-lib3rdparty.a : glib/ocaml-gspawn.o glib/ocaml-giochannel.o crypto/ocaml-openssl.o
+lib3rdparty.a : $(C_OBJ)
ar crs lib3rdparty.a $^
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)"
+crypto/ocaml-openssl.o : CINCDIRS = -ccopt "$(CRYPTO_CFLAGS)"
+gnomecanvas_hack.o : CINCDIRS = -ccopt "$(GNOMECANVAS_CFLAGS)"
%.ml : %.mll
$(OCAMLLEX) $<
@@ -116,7 +123,7 @@ dist : ../$(NAME)-$(VERSION).tar.gz
tar zcvf $(@F) $(addprefix $(NAME)-$(VERSION)/,$(DISTSRC)) && \
mv $(NAME)-$(VERSION) "$$DIRNAME"
-# not config.make
+# no config.make
ifndef OCAMLLEX
$(error run ./configure first (cf README))
endif