X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=Makefile;h=72c166777556653686b746b591b880a2ef59d047;hp=6f5d56d4c4a82b1c0ae81fc699f1aaf757df666f;hb=331db7c58d2011091e7c35776c841497e19a8501;hpb=3a30f6e1bb82b440eaf90fda82d2bbbb88c02716

diff --git a/Makefile b/Makefile
index 6f5d56d4..72c16677 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+DESTDIR ?= 
 PREFIX ?= /usr/local
 BINDIR ?= $(PREFIX)/bin
 LIBDIR ?= $(PREFIX)/lib/xonotic
@@ -9,6 +10,8 @@ LN ?= ln
 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
@@ -24,11 +27,13 @@ all-zip-binary:
 
 .PHONY: all-zip-source
 all-zip-source:
-	$(MAKE) -C source/fteqcc
-	$(MAKE) -C source/qcsrc FTEQCC=$(CURDIR)/source/fteqcc/fteqcc.bin
-	$(MAKE) -C source/darkplaces sv-release
-	$(MAKE) -C source/darkplaces cl-release
-	$(MAKE) -C source/darkplaces sdl-release
+	( cd source/d0_blind_id && ./configure --enable-static --disable-shared $(RIJNDAELDETECT_CONFIGURE) )
+	$(MAKE) -C source/d0_blind_id
+	$(MAKE) -C source/gmqcc
+	$(MAKE) -C source/qcsrc FTEQCC=$(CURDIR)/source/gmqcc/gmqcc
+	$(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
@@ -39,13 +44,15 @@ clean-git:
 	./all clean
 
 .PHONY: clean-zip
-clean-binary:
+clean-zip-binary:
 	@echo Nothing to do
 
 .PHONY: clean-zip
-clean-source:
-	@echo Sorry, this is not implemented yet
-	@false
+clean-zip-source:
+	-$(MAKE) -C source/d0_blind_id distclean
+	$(MAKE) -C source/gmqcc clean
+	$(MAKE) -C source/qcsrc clean
+	$(MAKE) -C source/darkplaces clean
 
 
 .PHONY: install-data
@@ -53,23 +60,23 @@ install-data: install-data-$(SUFFIX)
 
 .PHONY: 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
+	$(RM) -rf $(DESTDIR)$(LIBDIR)/data
+	$(INSTALL) -d $(DESTDIR)$(LIBDIR)/data
+	for p in data/*.pk3; do $(INSTALL) $$p $(DESTDIR)$(LIBDIR)/$$p || exit 1; done
+	for p in data/*.pk3dir; do ( cd $$p && $(ZIP) -r $(DESTDIR)$(LIBDIR)/$${p%dir} * ) || exit 1; done
 
 .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
+	$(RM) -rf $(DESTDIR)$(LIBDIR)/data
+	$(INSTALL) -d $(DESTDIR)$(LIBDIR)/data
+	for p in data/*.pk3; do $(INSTALL) $$p $(DESTDIR)$(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
+	$(RM) -rf $(DESTDIR)$(LIBDIR)/data
+	$(INSTALL) -d $(DESTDIR)$(LIBDIR)/data
+	for p in data/*.pk3; do $(INSTALL) $$p $(DESTDIR)$(LIBDIR)/$$p || exit 1; done
+	for p in data/xonotic-*-data*.pk3; do cd source && $(ZIP) $(DESTDIR)$(LIBDIR)/$$p progs.dat menu.dat csprogs.dat; done
 
 
 .PHONY: install-engine
@@ -77,48 +84,48 @@ install-engine: install-engine-$(SUFFIX)
 
 .PHONY: 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
-	$(INSTALL) xonotic-linux-dedicated.sh $(LIBDIR)/xonotic-linux-dedicated.sh
-	$(INSTALL) darkplaces/darkplaces-sdl $(LIBDIR)/xonotic-$(ARCH)-sdl
-	$(INSTALL) darkplaces/darkplaces-glx $(LIBDIR)/xonotic-$(ARCH)-glx
-	$(INSTALL) darkplaces/darkplaces-dedicated $(LIBDIR)/xonotic-$(ARCH)-dedicated
+	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
+	$(INSTALL) xonotic-linux-glx.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-glx.sh
+	$(INSTALL) xonotic-linux-sdl.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-sdl.sh
+	$(INSTALL) xonotic-linux-dedicated.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-dedicated.sh
+	$(INSTALL) darkplaces/darkplaces-sdl $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-sdl
+	$(INSTALL) darkplaces/darkplaces-glx $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-glx
+	$(INSTALL) darkplaces/darkplaces-dedicated $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-dedicated
 
 .PHONY: install-engine-zip-binary
-install-engine-zip: all-zip
-	$(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) xonotic-$(ARCH)-sdl $(LIBDIR)/xonotic-$(ARCH)-sdl
-	$(INSTALL) xonotic-$(ARCH)-glx $(LIBDIR)/xonotic-$(ARCH)-glx
-	$(INSTALL) xonotic-$(ARCH)-dedicated $(LIBDIR)/xonotic-$(ARCH)-dedicated
+install-engine-zip-binary: all-zip-binary
+	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
+	$(INSTALL) xonotic-linux-glx.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-glx.sh
+	$(INSTALL) xonotic-linux-sdl.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-sdl.sh
+	$(INSTALL) xonotic-linux-dedicated.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-dedicated.sh
+	$(INSTALL) xonotic-$(ARCH)-sdl $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-sdl
+	$(INSTALL) xonotic-$(ARCH)-glx $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-glx
+	$(INSTALL) xonotic-$(ARCH)-dedicated $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-dedicated
 
 .PHONY: install-engine-zip-source
-install-engine-zip: all-zip
-	$(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/xonotic-sdl $(LIBDIR)/xonotic-$(ARCH)-sdl
-	$(INSTALL) source/darkplaces/darkplaces-sdl $(LIBDIR)/xonotic-$(ARCH)-glx
-	$(INSTALL) source/darkplaces/darkplaces-dedicated $(LIBDIR)/xonotic-$(ARCH)-dedicated
+install-engine-zip-source: all-zip-source
+	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
+	$(INSTALL) xonotic-linux-glx.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-glx.sh
+	$(INSTALL) xonotic-linux-sdl.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-sdl.sh
+	$(INSTALL) xonotic-linux-dedicated.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-dedicated.sh
+	$(INSTALL) source/darkplaces/darkplaces-sdl $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-sdl
+	$(INSTALL) source/darkplaces/darkplaces-glx $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-glx
+	$(INSTALL) source/darkplaces/darkplaces-dedicated $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-dedicated
 
 
 .PHONY: install-links
 install-links:
 	$(INSTALL) -d $(BINDIR)
-	$(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
+	$(LN) -snf $(LIBDIR)/xonotic-linux-sdl.sh $(DESTDIR)$(BINDIR)/xonotic-sdl
+	$(LN) -snf $(LIBDIR)/xonotic-linux-glx.sh $(DESTDIR)$(BINDIR)/xonotic-glx
+	$(LN) -snf $(LIBDIR)/xonotic-linux-dedicated.sh $(DESTDIR)$(BINDIR)/xonotic-dedicated
 
 
 .PHONY: install-doc
 install-doc:
-	$(INSTALL) -d $(DOCDIR)/server
-	$(CP) -R Docs/* $(DOCDIR)/
-	$(CP) -R server/* $(DOCDIR)/server
+	$(INSTALL) -d $(DESTDIR)$(DOCDIR)/server
+	$(CP) -R Docs/* $(DESTDIR)$(DOCDIR)/
+	$(CP) -R server/* $(DESTDIR)$(DOCDIR)/server
 
 
 .PHONY: install