makefile.mk (7871dc3e) makefile.mk (cc99daad)
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

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

32
33.INCLUDE : settings.mk
34.INCLUDE : $(PRJ)$/util$/target.pmk
35
36.IF "$(SYSTEM_LIBXML)" == "YES"
37CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
38.ENDIF
39
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

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

32
33.INCLUDE : settings.mk
34.INCLUDE : $(PRJ)$/util$/target.pmk
35
36.IF "$(SYSTEM_LIBXML)" == "YES"
37CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
38.ENDIF
39
40.IF "$(WITH_MOZILLA)" == "NO" || "$(ENABLE_NSS_MODULE)"!="YES"
41.IF "$(SYSTEM_MOZILLA)" != "YES"
40.IF "$(ENABLE_NSS_MODULE)"!="YES"
42@all:
41@all:
43 @echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity/nss"
42 @echo "No nss -> no libxmlsec -> no xmlsecurity/nss"
44.ENDIF
43.ENDIF
45.ENDIF
46
47.IF "$(SYSTEM_MOZILLA)" != "YES"
48MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
49NSS_INC = $(MOZ_INC)$/nss
50NSPR_INC = $(MOZ_INC)$/nspr
51.ELSE
52# MOZ_INC already defined from environment
53NSS_INC = $(MOZ_NSS_CFLAGS)

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

113
114# --- Files --------------------------------------------------------
115
116SOLARINC += \
117 -I$(MOZ_INC) \
118-I$(NSPR_INC) \
119-I$(PRJ)$/source$/xmlsec
120
44
45.IF "$(SYSTEM_MOZILLA)" != "YES"
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)

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

111
112# --- Files --------------------------------------------------------
113
114SOLARINC += \
115 -I$(MOZ_INC) \
116-I$(NSPR_INC) \
117-I$(PRJ)$/source$/xmlsec
118
121.IF "$(SYSTEM_MOZILLA)" == "YES"
122SOLARINC += -DSYSTEM_MOZILLA $(NSS_INC)
123.ELSE
124SOLARINC += -I$(NSS_INC)
119SOLARINC += -I$(NSS_INC)
125.ENDIF
126
127SLOFILES = \
128 $(SLO)$/nssinitializer.obj \
129 $(SLO)$/digestcontext.obj \
130 $(SLO)$/ciphercontext.obj \
131 $(SLO)$/xsec_nss.obj
132
133.IF "$(CRYPTO_ENGINE)" == "nss"

--- 15 unchanged lines hidden --- 		120
121SLOFILES = \
122 $(SLO)$/nssinitializer.obj \
123 $(SLO)$/digestcontext.obj \
124 $(SLO)$/ciphercontext.obj \
125 $(SLO)$/xsec_nss.obj
126
127.IF "$(CRYPTO_ENGINE)" == "nss"

--- 15 unchanged lines hidden ---