blob: 0130db39e1895042bd6543c7759e2016bdf93821 (
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
43
44
45
|
38a39,42
> ifdef INSTALL_OVERRIDE
> INSTALLDIR=$(INSTALL_OVERRIDE)
> endif
>
51,58c55,64
< LIBCOMMON=-L$(INSTALLLIB) -lvlsilib
< SHLIBCOMMON=-L$(INSTALLLIB) -lvlsilib_sh
< LIBACT=-L$(INSTALLLIB) -lact -lvlsilib -ldl
< SHLIBACT=-L$(INSTALLLIB) -lact_sh -lvlsilib_sh -ldl
< LIBACTPASS=-L$(INSTALLLIB) -lactpass -lact -lvlsilib -ldl
< SHLIBACTPASS=-L$(INSTALLLIB) -lactpass_sh -lact_sh -lvlsilib_sh -ldl
< LIBSSIM=-L$(INSTALLLIB) -lssim -lvlsilib
< LIBASIM=-L$(INSTALLLIB) -lasim -lvlsilib
---
> LIBLOC=$(ACT_HOME)/lib
>
> LIBCOMMON=-L$(LIBLOC) -lvlsilib
> SHLIBCOMMON=-L$(LIBLOC) -lvlsilib_sh
> LIBACT=-L$(LIBLOC) -lact -lvlsilib -ldl
> SHLIBACT=-L$(LIBLOC) -lact_sh -lvlsilib_sh -ldl
> LIBACTPASS=-L$(LIBLOC) -lactpass -lact -lvlsilib -ldl
> SHLIBACTPASS=-L$(LIBLOC) -lactpass_sh -lact_sh -lvlsilib_sh -ldl
> LIBSSIM=-L$(LIBLOC) -lssim -lvlsilib
> LIBASIM=-L$(LIBLOC) -lasim -lvlsilib
62,68c68,74
< LIBDEPEND=$(INSTALLLIB)/libvlsilib.a
< ACTDEPEND=$(INSTALLLIB)/libact.a $(LIBDEPEND)
< ACTPASSDEPEND=$(ACTDEPEND) $(INSTALLLIB)/libactpass.a
< SSIMDEPEND=$(INSTALLLIB)/libssim.a $(LIBDEPEND)
< ASIMDEPEND=$(INSTALLLIB)/libasim.a $(LIBDEPEND)
< SCMDEPEND=$(INSTALLLIB)/libactscm.a
< SCMCLIDEPEND=$(INSTALLLIB)/libactscm.a $(INSTALLLIB)/libactscmcli.a
---
> LIBDEPEND=$(LIBLOC)/libvlsilib.a
> ACTDEPEND=$(LIBLOC)/libact.a $(LIBDEPEND)
> ACTPASSDEPEND=$(ACTDEPEND) $(LIBLOC)/libactpass.a
> SSIMDEPEND=$(LIBLOC)/libssim.a $(LIBDEPEND)
> ASIMDEPEND=$(LIBLOC)/libasim.a $(LIBDEPEND)
> SCMDEPEND=$(LIBLOC)/libactscm.a
> SCMCLIDEPEND=$(LIBLOC)/libactscm.a $(LIBLOC)/libactscmcli.a
73c79
< DFLAGS=-DARCH_$(ARCH) -DOS_$(OS) -DBASEOS_$(BASEOS) -I$(INSTALLINC) # -D_FORTIFY_SOURCE=0
---
> DFLAGS=-DARCH_$(ARCH) -DOS_$(OS) -DBASEOS_$(BASEOS) -I$(INSTALLINC) -I$(ACT_HOME)/include # -D_FORTIFY_SOURCE=0
|