This adjust the makefiles so that you can do such things as make gitweb from the top level make tree, or if your in the gitweb directory itself typing make will call back up to the main Makefile and build gitweb Signed-off-by: John 'Warthog9' Hawley <warthog9@xxxxxxxxxxxxxx> --- Makefile | 4 +++- gitweb/Makefile | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) create mode 100644 gitweb/Makefile
diff --git a/Makefile b/Makefile index 4a1e5bc..8db9d01 100644 --- a/Makefile +++ b/Makefile @@ -1509,6 +1509,8 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl chmod +x $@+ && \ mv $@+ $@ +.PHONY: gitweb +gitweb: gitweb/gitweb.cgi ifdef JSMIN OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/gitweb.min.js gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/gitweb.min.js @@ -1537,7 +1539,7 @@ endif -e 's|++GITWEB_JS++|$(GITWEB_JS)|g' \ -e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \ -e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \ - $< >$@+ && \ + $(patsubst %.cgi,%.perl,$@) >$@+ && \ chmod +x $@+ && \ mv $@+ $@ diff --git a/gitweb/Makefile b/gitweb/Makefile new file mode 100644 index 0000000..8d318b3 --- /dev/null +++ b/gitweb/Makefile @@ -0,0 +1,14 @@ +SHELL = /bin/bash + +FILES = gitweb.cgi + +.PHONY: $(FILES) + +all: $(FILES) + +$(FILES): + $(MAKE) $(MFLAGS) -C ../ -f Makefile gitweb/$@ + +clean: + rm -rf $(FILES) +