From 190c164c6060330f35972a9c82cb34d446468ca1 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 15 Aug 2010 14:55:45 +0200 Subject: [PATCH] remove lots of useless Nexuiz junk from the makefile --- Makefile | 98 -------------------------------------------------------- 1 file changed, 98 deletions(-) diff --git a/Makefile b/Makefile index 99478f084..83abf218d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ SCM := $(shell if [ -d .svn ]; then echo svn; elif [ -d ../.git ]; then echo git; fi) FTEQCC ?= fteqcc PERL ?= perl -PK3NAME ?= `date +../data%Y%m%d.pk3` ZIP ?= 7za a -tzip -mx=9 ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc DIFF ?= diff @@ -35,23 +34,6 @@ qc-recursive: menu.dat progs.dat csprogs.dat .PHONY: skin skin: gfx/menu/default/skinvalues.txt -.PHONY: pk3 -pk3: $(PK3NAME) - -.PHONY: pk3here -pk3here: qc - $(RM) $(PK3NAME); \ - set -ex; \ - ABSPK3NAME=$(PK3NAME); \ - case $$ABSPK3NAME in \ - /*) \ - ;; \ - *) \ - ABSPK3NAME=$$PWD/$$ABSPK3NAME; \ - ;; \ - esac; \ - $(ZIP) $(ZIPEXCLUDE) $$ABSPK3NAME . - .PHONY: clean clean: rm -f progs.dat menu.dat csprogs.dat @@ -71,86 +53,6 @@ menu.dat: qcsrc/menu/*.* qcsrc/menu/*/*.* qcsrc/common/*.* gfx/menu/default/skinvalues.txt: qcsrc/menu/skin-customizables.inc $(PERL) qcsrc/menu/skin-customizables.inc > gfx/menu/default/skinvalues.txt -$(PK3NAME): qc - $(RM) $(PK3NAME) - set -ex; \ - ABSPK3NAME=$(PK3NAME); \ - case $$ABSPK3NAME in \ - /*) \ - ;; \ - *) \ - ABSPK3NAME=$$PWD/$$ABSPK3NAME; \ - ;; \ - esac; \ - TDIR=`mktemp -d -t xonoticpk3.XXXXXX`; \ - cp -v progs.dat csprogs.dat menu.dat $$TDIR/; \ - svn export --force . $$TDIR; \ - cd $$TDIR; \ - $(ZIP) $$ABSPK3NAME . - .PHONY: testcase testcase: cd qcsrc/testcase && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_CSPROGS) -DTESTCASE="$$TESTCASE" - -.PHONY: update commit diff log logv logupdate logvupdate revert -update: $(SCM)-update -commit: $(SCM)-commit -diff: $(SCM)-diff -log: $(SCM)-log -logv: $(SCM)-logv -revert: $(SCM)-revert -logupdate: log update -logvupdate: logv update - -.PHONY: svn-update -svn-update: - cd .. && svn update - -.PHONY: svn-commit -svn-commit: - cd .. && svn commit - -.PHONY: svn-diff -svn-diff: - cd .. && svn diff - -.PHONY: svn-log -svn-log: - cd .. && svn log -r HEAD:BASE - -.PHONY: svn-logv -svn-logv: - cd .. && svn log -r HEAD:BASE -v - -.PHONY: svn-revert -svn-revert: - svn revert -- $(FILE) - -.PHONY: git-update -git-update: - git pull origin - -.PHONY: git-commit -git-commit: - git commit -a || true - if echo -n 'Also send to server? Hit Enter for yes, ^C for no. '; read -r L; then \ - git config svn-remote.svn.url svn://svn.icculus.org/xonotic; \ - git config svn-remote.svn.fetch trunk:refs/remotes/origin/master; \ - git svn dcommit; \ - fi - -.PHONY: git-diff -git-diff: - git diff; git diff origin/master..HEAD; true - -.PHONY: git-log -git-log: - git fetch && git log HEAD..origin/master - -.PHONY: git-logv -git-logv: - git fetch && git log -v HEAD..origin/master - -.PHONY: git-revert -git-revert: - git checkout -- $(FILE) -- 2.39.2