makefile.mk (74cab430) makefile.mk (0301d5ec)
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 28 unchanged lines hidden (view full) ---

37CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
38.ENDIF
39
40.IF "$(ENABLE_NSS_MODULE)"!="YES"
41@all:
42 @echo "No nss -> no libxmlsec -> no xmlsecurity/nss"
43.ENDIF
44
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 28 unchanged lines hidden (view full) ---

37CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
38.ENDIF
39
40.IF "$(ENABLE_NSS_MODULE)"!="YES"
41@all:
42 @echo "No nss -> no libxmlsec -> no xmlsecurity/nss"
43.ENDIF
44
45.IF "$(SYSTEM_MOZILLA)" != "YES"
45.IF "$(SYSTEM_NSS)" != "YES"
46MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
47NSS_INC = $(MOZ_INC)$/nss
48NSPR_INC = $(MOZ_INC)$/nspr
49.ELSE
46MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
47NSS_INC = $(MOZ_INC)$/nss
48NSPR_INC = $(MOZ_INC)$/nspr
49.ELSE
50# MOZ_INC already defined from environment
51NSS_INC = $(MOZ_NSS_CFLAGS)
52NSPR_INC = $(MOZ_INC)$/nspr
50# TODO: better use pkgconfig to find the proper system include path
51NSS_INC = /usr/include/nss3
52NSPR_INC = /usr/include/nspr4
53.ENDIF
54
55.IF "$(GUI)" == "WNT"
56.IF "$(DBG_LEVEL)" == "0"
57INCPRE += \
58-I$(MOZ_INC)$/profile \
59-I$(MOZ_INC)$/string \
60-I$(MOZ_INC)$/embed_base

--- 39 unchanged lines hidden (view full) ---

100CDEFS += -DXMLSEC_CRYPTO_NSS
101.ENDIF
102
103CDEFS += -DXMLSEC_NO_XSLT
104
105# --- Files --------------------------------------------------------
106
107SOLARINC += \
53.ENDIF
54
55.IF "$(GUI)" == "WNT"
56.IF "$(DBG_LEVEL)" == "0"
57INCPRE += \
58-I$(MOZ_INC)$/profile \
59-I$(MOZ_INC)$/string \
60-I$(MOZ_INC)$/embed_base

--- 39 unchanged lines hidden (view full) ---

100CDEFS += -DXMLSEC_CRYPTO_NSS
101.ENDIF
102
103CDEFS += -DXMLSEC_NO_XSLT
104
105# --- Files --------------------------------------------------------
106
107SOLARINC += \
108 -I$(MOZ_INC) \
109-I$(NSPR_INC) \
110-I$(PRJ)$/source$/xmlsec
108 -I$(NSPR_INC) \
109 -I$(PRJ)$/source$/xmlsec
111
112SOLARINC += -I$(NSS_INC)
113
114SLOFILES = \
115 $(SLO)$/nssinitializer.obj \
116 $(SLO)$/digestcontext.obj \
117 $(SLO)$/ciphercontext.obj \
118 $(SLO)$/xsec_nss.obj

--- 17 unchanged lines hidden ---
110
111SOLARINC += -I$(NSS_INC)
112
113SLOFILES = \
114 $(SLO)$/nssinitializer.obj \
115 $(SLO)$/digestcontext.obj \
116 $(SLO)$/ciphercontext.obj \
117 $(SLO)$/xsec_nss.obj

--- 17 unchanged lines hidden ---