summaryrefslogtreecommitdiff
blob: a90b963edd3c3af4046a526070cda850eee91499 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
--- xmlada-2016-src/Makefile.in.old	2016-12-04 21:58:57.251338692 +0100
+++ xmlada-2016-src/Makefile.in	2016-12-04 21:59:31.332755615 +0100
@@ -49,16 +49,17 @@
 endif
 
 static:
-	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr
+	${GPRBUILD} -p -v -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr -cargs $(ADAFLAGS)
 
 shared relocatable:
-	${GPRBUILD} -p -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr
+	${GPRBUILD} -p -v -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr -cargs $(ADAFLAGS)
 
 static-pic:
-	${GPRBUILD} -p -XLIBRARY_TYPE=static-pic ${GPROPTS} xmlada.gpr
+	${GPRBUILD} -p -v -XLIBRARY_TYPE=static-pic ${GPROPTS} xmlada.gpr -cargs $(ADAFLAGS)
 
 # Rebuild the tests (and not the XML/Ada code itself)
 test: force
+	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
 	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} \
 		-XTESTS_ACTIVATED=Only xmlada.gpr
 
--- xmlada-gpl-2016-src/tests/Makefile.old	2017-12-04 21:15:16.330459020 +0100
+++ xmlada-gpl-2016-src/tests/Makefile	2017-12-04 21:15:33.176156634 +0100
@@ -1,8 +1,6 @@
 TESTS= test_unicode \
 		 test_state \
-		 test_xml \
 		 test_adacore_dom \
-		 test_schema \
 		 test_date_time \
 		 test_numbers \
 		 test_adacore_schema \
@@ -71,6 +71,7 @@
 test_multiple_xsd:
 	@echo "multiple xsd"
 	@cd schema/multiple_xsd; \
+		GPR_PROJECT_PATH=../../../distrib:../../../input_sources:../../../dom:../../../sax:../../../schema:../../../unicode \
 		gprbuild -q -Pdefault.gpr; \
 		./validate > $(RESULTS)/multiple_xsd.out; \
 		cp $(RESULTS)/multiple_xsd.out $(RESULTS)/multiple_xsd.diff; \