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
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
--- src/src.gpr.orig 2015-06-22 10:52:10 UTC
+++ src/src.gpr
@@ -21,13 +21,14 @@ with "../.build/projects/aws_xmlada";
with "../shared";
with "../include/include";
with "../ssl/ssl";
+with "../templates_parser/temparse";
library project Src is
for Languages use ("Ada", "Project file", "Makefile");
for Source_Dirs use
- ("core", "extended", "../templates_parser/src", "../config/src",
+ ("core", "extended", "../config/src",
"../config/ssl", "../" & Shared.Target_Dir & "/setup/src", ".");
-- XMLAda Installed, add xsrc and soap directories
@@ -35,7 +36,7 @@ library project Src is
case Shared.XMLAda is
when "Installed" =>
for Source_Dirs use project'Source_Dirs &
- ("xsrc", "soap", "../templates_parser/xsrc");
+ ("xsrc", "soap");
when "Disabled" =>
null;
end case;
@@ -68,7 +69,7 @@ library project Src is
when "Windows_NT" =>
for Library_Options use ("-lwsock32", "-lws2_32");
when others =>
- null;
+ for Library_Options use ("-R", "-Wl,-R,@ADDITIONAL_RPATH@");
end case;
case Shared.LDAP is
@@ -79,7 +80,7 @@ library project Src is
Project'Library_Options & ("-lwldap32");
when others =>
for Library_Options use
- Project'Library_Options & ("-lldap");
+ Project'Library_Options & ("-L@PREFIX@/lib", "-lldap");
end case;
when "Disabled" =>
@@ -124,17 +125,6 @@ library project Src is
for Implementation_Suffix ("Makefile") use ".txt";
for Implementation_Exceptions ("Makefile") use ("Makefile");
- -- Templates Parser
-
- for Specification ("Templates_Parser.Configuration")
- use "templates_parser-configuration__aws.ads";
-
- for Implementation ("Templates_Parser.Input")
- use "templates_parser-input__aws.adb";
-
- for Implementation ("Templates_Parser_Tasking")
- use "templates_parser_tasking__standard_tasking.adb";
-
-- SOCKLIB
case Shared.SOCKLIB is
|