fix another typo

[xonotic/xonotic.git] / Makefile

diff --git a/Makefile b/Makefile
index 8be69c8e9ec54aa3834efdd33485431d1ea7d1bb..02d20ae9d3921cefea0f9a4301090e271e15029d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,11 @@ ZIP ?= zip -9
 INSTALL ?= install
 ARCH ?= $(shell if [ x"`uname -m`" = x"x86_64" ]; then echo linux64; else echo linux32; fi)
 LN ?= ln
-SUFFIX ?= $(shell if [ -d .git ]; then echo git; else echo zip; fi)
 CP ?= cp
+BINARY ?= yes
+SUFFIX ?= $(shell if [ -d .git ]; then echo git; elif [ x"$(BINARY)" = x"yes" ]; then echo zip-binary; else echo zip-source; fi)
+RIJNDAELDETECT_CONFIGURE ?= $(shell if ! [ -f source/d0_blind_id/d0_rijndael.c ]; then echo --disable-rijndael; fi)
+RIJNDAELDETECT_MAKE_DP ?= $(shell if [ -f source/d0_blind_id/d0_rijndael.c ]; then echo DP_CRYPTO_RIJNDAEL_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs; fi)
 
 
 .PHONY: all
@@ -17,10 +20,19 @@ all: all-$(SUFFIX)
 all-git:
        ./all compile -r
 
-.PHONY: all-zip
-all-zip:
-       @echo Sorry, this is not implemented yet
-       @false
+.PHONY: all-zip-binary
+all-zip-binary:
+       @echo Nothing to do
+
+.PHONY: all-zip-source
+all-zip-source:
+       ( cd source/d0_blind_id && ./configure --enable-static --disable-shared $(RIJNDAELDETECT_CONFIGURE) )
+       $(MAKE) -C source/d0_blind_id
+       $(MAKE) -C source/fteqcc
+       $(MAKE) -C source/qcsrc FTEQCC=$(CURDIR)/source/fteqcc/fteqcc.bin
+       $(MAKE) -C source/darkplaces sv-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
+       $(MAKE) -C source/darkplaces cl-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
+       $(MAKE) -C source/darkplaces sdl-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
 
 
 .PHONY: clean
@@ -31,33 +43,46 @@ clean-git:
        ./all clean
 
 .PHONY: clean-zip
-clean-zip:
-       @echo Sorry, this is not implemented yet
-       @false
+clean-zip-binary:
+       @echo Nothing to do
+
+.PHONY: clean-zip
+clean-zip-source:
+       -$(MAKE) -C source/d0_blind_id distclean
+       $(MAKE) -C source/fteqcc clean
+       $(MAKE) -C source/qcsrc clean
+       $(MAKE) -C source/darkplaces clean
 
 
 .PHONY: install-data
 install-data: install-data-$(SUFFIX)
 
 .PHONY: install-data-git
-install-data-git:
+install-data-git: all-git
        $(RM) -rf $(LIBDIR)/data
        $(INSTALL) -d $(LIBDIR)/data
        for p in data/*.pk3; do $(INSTALL) $$p $(LIBDIR)/$$p || exit 1; done
        for p in data/*.pk3dir; do ( cd $$p; $(ZIP) -r $(LIBDIR)/$${p%dir} * ) || exit 1; done
 
-.PHONY: install-data-zip
-install-data-zip:
+.PHONY: install-data-zip-binary
+install-data-zip-binary: all-zip-binary
+       $(RM) -rf $(LIBDIR)/data
+       $(INSTALL) -d $(LIBDIR)/data
+       for p in data/*.pk3; do $(INSTALL) $$p $(LIBDIR)/$$p || exit 1; done
+
+.PHONY: install-data-zip-source
+install-data-zip-source: all-zip-source
        $(RM) -rf $(LIBDIR)/data
        $(INSTALL) -d $(LIBDIR)/data
        for p in data/*.pk3; do $(INSTALL) $$p $(LIBDIR)/$$p || exit 1; done
+       for p in data/xonotic-*-data*.pk3; do cd source; $(ZIP) $(LIBDIR)/$$p progs.dat menu.dat csprogs.dat; done
 
 
 .PHONY: install-engine
 install-engine: install-engine-$(SUFFIX)
 
 .PHONY: install-engine-git
-install-engine-git:
+install-engine-git: all-git
        $(INSTALL) -d $(LIBDIR)
        $(INSTALL) xonotic-linux-glx.sh $(LIBDIR)/xonotic-linux-glx.sh
        $(INSTALL) xonotic-linux-sdl.sh $(LIBDIR)/xonotic-linux-sdl.sh
@@ -66,8 +91,8 @@ install-engine-git:
        $(INSTALL) darkplaces/darkplaces-glx $(LIBDIR)/xonotic-$(ARCH)-glx
        $(INSTALL) darkplaces/darkplaces-dedicated $(LIBDIR)/xonotic-$(ARCH)-dedicated
 
-.PHONY: install-engine-zip
-install-engine-zip:
+.PHONY: install-engine-zip-binary
+install-engine-zip-binary: all-zip-binary
        $(INSTALL) -d $(LIBDIR)
        $(INSTALL) xonotic-linux-glx.sh $(LIBDIR)/xonotic-linux-glx.sh
        $(INSTALL) xonotic-linux-sdl.sh $(LIBDIR)/xonotic-linux-sdl.sh
@@ -76,13 +101,23 @@ install-engine-zip:
        $(INSTALL) xonotic-$(ARCH)-glx $(LIBDIR)/xonotic-$(ARCH)-glx
        $(INSTALL) xonotic-$(ARCH)-dedicated $(LIBDIR)/xonotic-$(ARCH)-dedicated
 
+.PHONY: install-engine-zip-source
+install-engine-zip-source: all-zip-source
+       $(INSTALL) -d $(LIBDIR)
+       $(INSTALL) xonotic-linux-glx.sh $(LIBDIR)/xonotic-linux-glx.sh
+       $(INSTALL) xonotic-linux-sdl.sh $(LIBDIR)/xonotic-linux-sdl.sh
+       $(INSTALL) xonotic-linux-dedicated.sh $(LIBDIR)/xonotic-linux-dedicated.sh
+       $(INSTALL) source/darkplaces/darkplaces-sdl $(LIBDIR)/xonotic-$(ARCH)-sdl
+       $(INSTALL) source/darkplaces/darkplaces-glx $(LIBDIR)/xonotic-$(ARCH)-glx
+       $(INSTALL) source/darkplaces/darkplaces-dedicated $(LIBDIR)/xonotic-$(ARCH)-dedicated
+
 
 .PHONY: install-links
 install-links:
        $(INSTALL) -d $(BINDIR)
-       $(LN) -snf $(LIBDIR)/xonotic-$(ARCH)-sdl $(BINDIR)/xonotic-sdl
-       $(LN) -snf $(LIBDIR)/xonotic-$(ARCH)-glx $(BINDIR)/xonotic-glx
-       $(LN) -snf $(LIBDIR)/xonotic-$(ARCH)-dedicated $(BINDIR)/xonotic-dedicated
+       $(LN) -snf $(LIBDIR)/xonotic-linux-sdl.sh $(BINDIR)/xonotic-sdl
+       $(LN) -snf $(LIBDIR)/xonotic-linux-glx.sh $(BINDIR)/xonotic-glx
+       $(LN) -snf $(LIBDIR)/xonotic-linux-dedicated.sh $(BINDIR)/xonotic-dedicated
 
 
 .PHONY: install-doc