From fd9f2fc4783cc606734e61116185c032a63d54a0 Mon Sep 17 00:00:00 2001
From: Wojtek Kosior <koszko@koszko.org>
Date: Wed, 16 Feb 2022 22:01:38 +0100
Subject: fix out-of-source builds

---
 Makefile.in | 50 ++++++++++++++++++++++----------------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 28ccb85..862c610 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,9 +17,10 @@ VPATH = <<VPATH>>
 
 version = <<VERSION>>
 extension_files = background/ common/ content/ html/ licenses/ \
-        copyright default_settings.json manifest.json
+	icons/ copyright default_settings.json manifest.json
 
-metafiles = build.sh configure Makefile.in process_html_file.sh README.txt \
+
+metafiles = build.sh configure Makefile.in compute_scripts.awk README.txt \
         re-generate_icons.sh shell_utils.sh upload_amo.sh write_makefile.sh
 
 # Configuration gets included here by write_makefile.sh
@@ -47,11 +48,11 @@ chromium: chromium-build.zip
 unpacked: $(default_target)-unpacked Makefile
 all-unpacked: mozilla-unpacked chromium-unpacked
 %-unpacked: $(extension_files) icons/haketilo16.png
-	$(srcdir)/build.sh $* $(srcdir) $(UPDATE_URL)
+	"$(srcdir)/build.sh" $* $(srcdir) $(UPDATE_URL)
 
 install install-strip: $(default_target)-unpacked
 	cp -R $(default_target)-unpacked \
-	"$(DESTDIR)/{6fe13369-88e9-440f-b837-5012fb3bedec}"
+		"$(DESTDIR)/{6fe13369-88e9-440f-b837-5012fb3bedec}"
 
 uninstall:
 	rm -r "$(DESTDIR)/{6fe13369-88e9-440f-b837-5012fb3bedec}"
@@ -59,37 +60,37 @@ uninstall:
 %-build.zip: %-unpacked Makefile
 	cd $< && zip -q -r ../$@ *
 
-test/:
-	mkdir $@
-
-test/certs/: | test/
+certs/:
 	mkdir $@
 
-test/certs/%.key: | test/certs/
+certs/%.key: | certs/
 	openssl genrsa -out $@ 2048
 
-test/certs/rootCA.pem: test/certs/rootCA.key
+certs/rootCA.pem: certs/rootCA.key
 	openssl req -x509 -new -nodes -key $< -days 1024 -out $@ \
 		 -subj "/CN=Haketilo Test"
 
-test: test/certs/rootCA.pem test/certs/site.key $(default_target)-build.zip
-	MOZ_HEADLESS=whatever $(PYTHON) -m pytest
+pytest.ini: pytest.ini.in
+	sed "s|<<SRCDIR>>|$(srcdir)|" <$< > $@
 
-test-environment: test/certs/rootCA.pem test/certs/site.key
-	python3 -m test
+test: certs/rootCA.pem certs/site.key $(default_target)-build.zip \
+		pytest.ini
+	PYTHONPYCACHEPREFIX=$$(pwd)/test__pycache__ MOZ_HEADLESS=whatever \
+		"$(PYTHON)" -m pytest
 
-test-environment-with-haketilo: test/certs/rootCA.pem test/certs/site.key \
+test-environment: certs/rootCA.pem certs/site.key
+	"$(PYTHON)" -m test
+
+test-environment-with-haketilo: certs/rootCA.pem certs/site.key \
 		$(default_target)-build.zip
-	python3 -m test --load-haketilo
+	"$(PYTHON)" -m test --load-haketilo
 
 # helper targets
 clean mostlyclean:
 	rm -rf mozilla-unpacked chromium-unpacked haketilo-[1-9]*
 	rm -f mozilla-build.zip chromium-build.zip exports_init.js
-	rm -rf test/certs
-	rm -rf $$(find . -name geckodriver.log)
-	rm -rf $$(find . -type d -name __pycache__)
-	rm -rf $$(find . -type d -name injected_scripts)
+	rm -rf pytest.ini certs injected_scripts geckodriver.log
+	rm -rf certs/ test__pycache__/ .pytest_cache/
 
 distclean: clean
 	rm -f Makefile config.status record.conf
@@ -99,14 +100,6 @@ maintainer-clean: distclean
 	@echo 'deletes files that may need special tools to rebuild.'
 	rm -f "$(srcdir)"/icons/*.png
 
-dist: $(extension_files) $(metafiles) icons/haketilo16.png
-	test -d haketilo-$(version) || mkdir haketilo-$(version)
-	for file in $(extension_files) $(metafiles) icons/; do \
-	    cp -R "$(srcdir)"/$$file haketilo-$(version); \
-	done
-	tar cf haketilo-$(version).tar haketilo-$(version)
-	gzip haketilo-$(version).tar
-
 # Files for constructing the makefile
 Makefile: config.status Makefile.in record.conf
 	./config.status
@@ -115,6 +108,7 @@ config.status: write_makefile.sh
 	cp "$(srcdir)"/write_makefile.sh config.status
 
 # Unused GNU-specified targets
+dist:
 install-html:
 install-dvi:
 install-pdf:
-- 
cgit v1.2.3