Go to most recent revision | Details | Last modification | View Log | RSS feed
Rev | Author | Line No. | Line |
---|---|---|---|
2 | magnus | 1 | --- a/Makefile |
2 | +++ b/Makefile |
||
3 | @@ -57,6 +57,10 @@ PREFIX=/var/zxid/$(ZXIDREL) |
||
4 | ### well. N.B. Trailing / (forward slash) is needed. |
||
5 | ZXID_PATH=/var/zxid/ |
||
6 | |||
7 | +SHLIBLINK=libzxid.so |
||
8 | +SONAME=$(SHLIBLINK).0 |
||
9 | +SHLIB=$(SONAME).0 |
||
10 | + |
||
11 | ### |
||
12 | ### Module selection options (you should enable all, unless building embedded) |
||
13 | ### |
||
14 | @@ -154,7 +158,7 @@ LIBS+= -lcurl -lssl -lcrypto -lz $(POSTL |
||
15 | ### Where commands for build are found (override for cross compiler or Windows) |
||
16 | |||
17 | #CC=ccache gcc |
||
18 | -CC?=gcc |
||
19 | +CC=gcc |
||
20 | # If you want to override LD setting you must supply LD_ALT on command line or use localconf.mk |
||
21 | LD_ALT?=$(CC) |
||
22 | LD=$(LD_ALT) |
||
23 | @@ -699,7 +703,7 @@ precheck/chk-%$(EXE): precheck/chk-%.$(O |
||
24 | @if $(LD) $(OUTOPT)$@ $< $(LDFLAGS) $(LIBS) ; then : ; else \ |
||
25 | echo Failed command:; echo '$(LD) $(OUTOPT)$@ $< $(LDFLAGS) $(LIBS)' ; false; fi |
||
26 | |||
27 | -%$(EXE): %.$(OBJ_EXT) |
||
28 | +%$(EXE): %.$(OBJ_EXT) $(SHLIBLINK) |
||
29 | @echo " Linking $@" |
||
30 | @if $(LD) $(OUTOPT)$@ $< $(LDFLAGS) $(LIBZXID) $(LIBS) ; then : ; else \ |
||
31 | echo Failed command:; echo '$(LD) $(OUTOPT)$@ $< $(LDFLAGS) $(LIBZXID) $(LIBS)' ; false; fi |
||
32 | @@ -716,7 +720,7 @@ export LC_COLLATE LC_NUMERIC |
||
33 | |||
34 | DEFAULT_EXE= zxidhlo$(EXE) zxididp$(EXE) zxidhlowsf$(EXE) zxidsimple$(EXE) zxidwsctool$(EXE) zxlogview$(EXE) zxidhrxmlwsc$(EXE) zxidhrxmlwsp$(EXE) zxdecode$(EXE) zxcot$(EXE) zxpasswd$(EXE) zxcall$(EXE) zxencdectest$(EXE) |
||
35 | |||
36 | -ALL_EXE= smime$(EXE) zxidwspcgi$(EXE) zxid_httpd$(EXE) htpasswd$(EXE) |
||
37 | +ALL_EXE= smime$(EXE) zxidwspcgi$(EXE) zxid_httpd$(EXE) htpasswd$(EXE) zxbusd$(EXE) zxbustailf$(EXE) zxbuslist$(EXE) |
||
38 | |||
39 | #$(info DEFAULT_EXE=$(DEFAULT_EXE)) |
||
40 | |||
41 | @@ -1211,8 +1215,8 @@ endif |
||
42 | |||
43 | # Overall |
||
44 | |||
45 | -samlmod Net/Makefile: Net/SAML_wrap.c Net/SAML.pm $(LIBZXID_A) |
||
46 | - cd Net; $(PERL) Makefile.PL && $(MAKE) |
||
47 | +samlmod Net/Makefile: Net/SAML_wrap.c Net/SAML.pm $(SHLIBLINK) |
||
48 | + cd Net; $(PERL) Makefile.PL INSTALLDIRS=vendor && $(MAKE) |
||
49 | |||
50 | samlmod_install: Net/Makefile |
||
51 | cd Net; $(MAKE) install |
||
52 | @@ -1284,9 +1288,9 @@ php/php_zxid$(SO): php/zxid_wrap.$(OBJ_E |
||
53 | phpzxid: php/php_zxid$(SO) |
||
54 | |||
55 | phpzxid_install: php/php_zxid$(SO) |
||
56 | - @$(ECHO) Installing in `$(PHP_CONFIG) --extension-dir` |
||
57 | - mkdir -p `$(PHP_CONFIG) --extension-dir` |
||
58 | - $(CP) $< `$(PHP_CONFIG) --extension-dir` |
||
59 | + @$(ECHO) Installing in $(DESTDIR)`$(PHP_CONFIG) --extension-dir` |
||
60 | + mkdir -p $(DESTDIR)`$(PHP_CONFIG) --extension-dir` |
||
61 | + $(CP) $< $(DESTDIR)`$(PHP_CONFIG) --extension-dir` |
||
62 | |||
63 | #cp zxid.ini `$(PHP_CONFIG) --extension-dir` |
||
64 | |||
65 | @@ -1476,7 +1480,7 @@ ZxidServlet.class: ZxidServlet.java zxid |
||
66 | $(JAVAC) $(JAVAC_FLAGS) -classpath $(SERVLET_PATH) zxidjava/*.java ZxidServlet.java |
||
67 | |||
68 | zxidjava.jar: zxidjava/zxidjni.class zxidjava/README.zxid-java |
||
69 | - $(CP) COPYING LICENSE-2.0.txt LICENSE.openssl LICENSE.ssleay LICENSE.curl zxidjava/ |
||
70 | + $(CP) COPYING LICENSE-2.0.txt zxidjava/ |
||
71 | $(JAR) cf zxidjava.jar zxidjava/*.class zxidjava/*.java zxidjava/COPYING zxidjava/LICENSE* |
||
72 | |||
73 | zxiddemo.war: zxidjava.jar |
||
74 | @@ -1549,7 +1553,7 @@ precheck_apache: precheck/chk-apache.$( |
||
75 | apachezxid: precheck_apache precheck mod_auth_saml$(SO) |
||
76 | |||
77 | apachezxid_install: mod_auth_saml$(SO) |
||
78 | - $(CP) $< $(APACHE_MODULES) |
||
79 | + $(CP) $< $(DESTDIR)$(APACHE_MODULES) |
||
80 | |||
81 | mod_auth_saml: apachezxid |
||
82 | @$(ECHO) "mod_auth_saml: not an official target. Use make apachezxid" |
||
83 | @@ -1587,7 +1591,7 @@ mini_httpd_zxid: $(MINI_HTTPD_DIR)/mini_ |
||
84 | ### zxid_httpd (derived from mini_httd). |
||
85 | ### |
||
86 | |||
87 | -zxid_httpd$(EXE): zxid_httpd.$(OBJ_EXT) tdate_parse.$(OBJ_EXT) mini_httpd_filter.$(OBJ_EXT) $(LIBZXID_A) |
||
88 | +zxid_httpd$(EXE): zxid_httpd.$(OBJ_EXT) tdate_parse.$(OBJ_EXT) mini_httpd_filter.$(OBJ_EXT) $(SHLIBLINK) |
||
89 | $(warning ZXID_HTTPD LINK) |
||
90 | $(LD) $(LDFLAGS) $(OUTOPT)$@ $^ $(LIBS) |
||
91 | |||
92 | @@ -1597,7 +1601,7 @@ zxid_httpd$(EXE): zxid_httpd.$(OBJ_EXT) |
||
93 | |||
94 | #zxid$(EXE): zxid.$(OBJ_EXT) $(LIBZXID_A) |
||
95 | |||
96 | -$(DEFAULT_EXE) $(ALL_EXE): $(LIBZXID_A) |
||
97 | +$(DEFAULT_EXE) $(ALL_EXE): $(SHLIBLINK) $(SONAME) |
||
98 | |||
99 | zxcot-static-x64: zxcot.$(OBJ_EXT) $(LIBZXID_A) |
||
100 | diet gcc $(OUTOPT)$@$(EXE) $< -static -L. -lzxid -pthread -lpthread -L$(DIET_ROOT)/lib -L$(DIET_ROOT)/ssl/lib-x86_64 -lcurl -lssl -lcrypto -lz |
||
101 | @@ -1653,7 +1657,7 @@ zxbustailf-static-x64: zxbustailf.$(OBJ_ |
||
102 | zxbuslist-static-x64: zxbuslist.$(OBJ_EXT) $(LIBZXID_A) |
||
103 | diet gcc $(OUTOPT)$@ $< -static -L. -lzxid -pthread -lpthread -L$(DIET_ROOT)/lib -L$(DIET_ROOT)/ssl/lib-x86_64 -lcurl -lssl -lcrypto -lz |
||
104 | |||
105 | -zxbusd: $(ZXBUSD_OBJ) $(LIBZXID_A) |
||
106 | +zxbusd: $(ZXBUSD_OBJ) $(SHLIBLINK) |
||
107 | $(CC) $(OUTOPT)$@ $^ $(LIBS) |
||
108 | |||
109 | zxbusd-static-x64: $(ZXBUSD_OBJ) $(LIBZXID_A) |
||
110 | @@ -1691,8 +1695,11 @@ $(LIBZXID_A): $(ZX_OBJ) $(ZX_GEN_C:.c=.o |
||
111 | endif |
||
112 | endif |
||
113 | |||
114 | -libzxid.so.0.0: $(LIBZXID_A) |
||
115 | - $(LD) $(OUTOPT)libzxid.so.0.0 $(SHARED_FLAGS) $^ $(SHARED_CLOSE) $(LIBS) |
||
116 | +$(SHLIB): $(ZX_OBJ) $(ZX_GEN_C:.c=.o) $(ZXID_LIB_OBJ) $(WSF_OBJ) $(OAUTH_OBJ) $(SMIME_LIB_OBJ) |
||
117 | + $(LD) $(LDFLAGS) -Wl,-soname=$(SONAME) $(OUTOPT)libzxid.so.0.0 $(SHARED_FLAGS) $^ $(SHARED_CLOSE) $(LIBS) |
||
118 | + |
||
119 | +$(SHLIBLINK) $(SONAME): $(SHLIB) |
||
120 | + ln -sf $< $@ |
||
121 | |||
122 | zxid.dll zxidimp.lib: $(LIBZXID_A) |
||
123 | $(LD) $(OUTOPT)zxid.dll $(SHARED_FLAGS) -Wl,--output-def,zxid.def,--out-implib,zxidimp.lib $^ $(SHARED_CLOSE) $(SO_LIBS) |
||
124 | @@ -2000,13 +2007,11 @@ dirs: dir |
||
125 | |||
126 | install_nodep: |
||
127 | @$(ECHO) "===== Installing in $(PREFIX) (to change do make install PREFIX=/your/path)" |
||
128 | - -mkdir -p $(PREFIX) $(PREFIX)/bin $(PREFIX)/lib $(PREFIX)/include/zxid $(PREFIX)/include/zx $(PREFIX)/doc |
||
129 | - $(CP) zxmkdirs.sh zxcall zxpasswd zxcot zxlogview zxbusd zxbustailf zxbuslist zxdecode zxencdectest zxcleanlogs.sh zximport-htpasswd.pl zximport-ldif.pl xml-pretty.pl diffy.pl smime send.pl xacml2ldif.pl mockpdp.pl env.cgi zxid-java.sh zxidatsel.pl zxidnewuser.pl zxidcot.pl zxiddash.pl zxidexplo.pl zxidhlo zxidhlo.pl zxidhlo.php zxidhlo.sh zxidhlo-java.sh zxidhlocgi.php zxidhlowsf zxidhrxmlwsc zxidhrxmlwsp zxididp zxidsimple zxidwsctool zxidwspcgi zxtest.pl mini_httpd_zxid $(PREFIX)/bin |
||
130 | - $(CP) $(LIBZXID_A) libzxid.so* $(PREFIX)/lib |
||
131 | - $(CP) libzxid.so.0.0 $(PREFIX)/lib |
||
132 | - $(CP) *.h c/*.h $(PREFIX)/include/zxid |
||
133 | - $(CP) zx.h $(PREFIX)/include/zx |
||
134 | - $(CP) *.pd *.dia $(PREFIX)/doc |
||
135 | + -mkdir -p "$(DESTDIR)$(PREFIX)" "$(DESTDIR)$(PREFIX)/bin" "$(DESTDIR)$(PREFIX)/lib" "$(DESTDIR)$(PREFIX)/include/zx" "$(DESTDIR)$(PREFIX)/share/doc" |
||
136 | + $(CP) zxmkdirs.sh zxcall zxpasswd zxcot zxlogview zxbusd zxbustailf zxbuslist zxdecode zxencdectest zxcleanlogs.sh zximport-htpasswd.pl zximport-ldif.pl xml-pretty.pl diffy.pl smime send.pl xacml2ldif.pl mockpdp.pl env.cgi zxid-java.sh zxidatsel.pl zxidnewuser.pl zxidcot.pl zxiddash.pl zxidexplo.pl zxidhlo zxidhlo.pl zxidhlo.php zxidhlo.sh zxidhlo-java.sh zxidhlocgi.php zxidhlowsf zxidhrxmlwsc zxidhrxmlwsp zxididp zxidsimple zxidwsctool zxidwspcgi zxtest.pl zxid_httpd $(DESTDIR)$(PREFIX)/bin |
||
137 | + $(CP) $(LIBZXID_A) libzxid.so* $(DESTDIR)$(PREFIX)/lib |
||
138 | + $(CP) $(SHLIB) $(DESTDIR)$(PREFIX)/lib |
||
139 | + $(CP) *.h $(DESTDIR)$(PREFIX)/include/zx |
||
140 | @$(ECHO) "You will need to copy zxidhlo binary where your web server can find it and" |
||
141 | @$(ECHO) "make sure your web server is configured to recognize zxidhlo as a CGI script." |
||
142 | @$(ECHO) |