From cc1dbd1b5d610bd5e626f54d310f11cf47684ea1 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Thu, 10 May 2007 11:25:12 +0200 Subject: Add submodules.sh and use it during builds This adds a shell script which can be be used to initialize, list and update submodules in a git repository. It reads the file .gitmodules to find a mapping between submodule path and repository url for the initial clone of all submodules. The script is used during cgit builds to enable automatic download and checkout of the git git repository. Signed-off-by: Lars Hjemli --- Makefile | 49 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 13 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 644914c..138f261 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,11 @@ CGIT_VERSION = 0.2 prefix = /var/www/htdocs/cgit -gitsrc = git SHA1_HEADER = CACHE_ROOT = /var/cache/cgit -EXTLIBS = $(gitsrc)/libgit.a $(gitsrc)/xdiff/lib.a -lz -lcrypto +EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \ ui-snapshot.o ui-blob.o @@ -17,28 +16,52 @@ ifdef DEBUG CFLAGS += -g endif -CFLAGS += -I$(gitsrc) -DSHA1_HEADER='$(SHA1_HEADER)' +CFLAGS += -Igit -DSHA1_HEADER='$(SHA1_HEADER)' + + + +# +# basic build rules +# all: cgit +cgit: cgit.c cgit.h $(OBJECTS) + $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \ + $(OBJECTS) $(EXTLIBS) + +$(OBJECTS): cgit.h git/libgit.a + +git/libgit.a: + ./submodules.sh -i + $(MAKE) -C git + +# +# phony targets +# install: all clean-cache mkdir -p $(prefix) install cgit $(prefix)/cgit.cgi install cgit.css $(prefix)/cgit.css -cgit: cgit.c cgit.h $(OBJECTS) $(gitsrc)/libgit.a - $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \ - $(OBJECTS) $(EXTLIBS) - -$(OBJECTS): cgit.h +clean-cgit: + rm -f cgit *.o -$(gitsrc)/libgit.a: - $(MAKE) -C $(gitsrc) +distclean-cgit: clean-cgit + git clean -d -x +clean-sub: + $(MAKE) -C git clean -.PHONY: clean -clean: - rm -f cgit *.o +distclean-sub: clean-sub + $(shell cd git && git clean -d -x) clean-cache: rm -rf $(CACHE_ROOT)/* + +clean: clean-cgit clean-sub + +distclean: distclean-cgit distclean-sub + +.PHONY: all install clean clean-cgit clean-sub clean-cache \ + distclean distclean-cgit distclean-sub -- cgit 1.4.1 lass='left'>Commit message (Expand)Author 2007-05-11Add submodule links in tree listingLars Hjemli 2007-05-11Add submodules.sh and use it during buildsLars Hjemli 2007-05-11Added git as a submoduleLars Hjemli 2007-05-09Add support for downloading single blobsLars Hjemli 2007-05-08ui-view: show pathname if specified in querystringLars Hjemli 2007-05-08Update to libgit 1.5.2-rc2Lars Hjemli 2007-02-21Layout updateLars Hjemli 2007-02-08Make snapshot feature configurableLars Hjemli 2007-02-08Add support for snapshotsLars Hjemli 2007-02-05cgit v0.2Lars Hjemli 2007-02-05Add support for prefix and gitsrc arguments to 'make'Lars Hjemli 2007-02-04Update cgitrc templateLars Hjemli 2007-02-04Add support for lightweight tagsLars Hjemli 2007-02-04Read repo-info from /etc/cgitrcLars Hjemli 2007-02-04Do not die if tag has no messageLars Hjemli 2007-02-03Fix search for non-virtual urlsLars Hjemli 2007-01-28Update README with install/config informationLars Hjemli