makefile.mk (5866f8e4) makefile.mk (fdf35928)
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

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

43
44.INCLUDE: settings.mk
45.IF "$(L10N_framework)"==""
46
47APRINCDIR=apr
48APRUTILINCDIR=apr-util
49SERFINCDIR=serf
50
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

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

43
44.INCLUDE: settings.mk
45.IF "$(L10N_framework)"==""
46
47APRINCDIR=apr
48APRUTILINCDIR=apr-util
49SERFINCDIR=serf
50
51#.IF "$(SYSTEM_APR)" != "YES"
52#.INCLUDE: $(SOLARINCDIR)$/$(APRINCDIR)$/version.mk
53#.ENDIF
54#.IF "$(SYSTEM_APRUTIL)" != "YES"
55#.INCLUDE: $(SOLARINCDIR)$/$(APRUTILINCDIR)$/version.mk
56#.ENDIF
57#.IF "$(SYSTEM_SERF)" != "YES"
58#.INCLUDE: $(SOLARINCDIR)$/$(SERFINCDIR)$/version.mk
59#.ENDIF
60
61#CFLAGS+= -DAPR_VERSION=0x$(APR_VERSION) -DAPRUTIL_VERSION=0x$(APRUTIL_VERSION) -DSERF_VERSION=0x$(SERF_VERSION)
62
63#
64# Extend the list of include paths depending on whether we use locally built
65# or system versions of libraries apr, apr-util, serf, libxml
66#
67# We have to use CFLAGS for this because PRJINC is too inflexible (it adds /inc to everyting.)
68#
69
70.IF "$(SYSTEM_APR)" == "YES"
71CFLAGS+= $(APR_CFLAGS)
51#
52# Extend the list of include paths depending on whether we use locally built
53# or system versions of libraries apr, apr-util, serf, libxml
54#
55# We have to use CFLAGS for this because PRJINC is too inflexible (it adds /inc to everyting.)
56#
57
58.IF "$(SYSTEM_APR)" == "YES"
59CFLAGS+= $(APR_CFLAGS)
60SHL1STDLIBS+=$(APR_LIBS)
72.ELSE
73CFLAGS+= -I$(SOLARINCDIR)$/$(APRINCDIR)
61.ELSE
62CFLAGS+= -I$(SOLARINCDIR)$/$(APRINCDIR)
63SHL1STDLIBS+=$(INTERNAL_APR_LIBS)
74.ENDIF
75
76.IF "$(SYSTEM_APRUTIL)" == "YES"
77CFLAGS+= $(APRUTIL_CFLAGS)
64.ENDIF
65
66.IF "$(SYSTEM_APRUTIL)" == "YES"
67CFLAGS+= $(APRUTIL_CFLAGS)
68SHL1STDLIBS+=$(APRUTIL_LIBS)
78.ELSE
79CFLAGS+= -I$(SOLARINCDIR)$/$(APRUTILINCDIR)
69.ELSE
70CFLAGS+= -I$(SOLARINCDIR)$/$(APRUTILINCDIR)
71SHL1STDLIBS+=$(INTERNAL_APRUTIL_LIBS)
80.ENDIF
81
82.IF "$(SYSTEM_SERF)" == "YES"
83CFLAGS+= $(SERF_CFLAGS)
72.ENDIF
73
74.IF "$(SYSTEM_SERF)" == "YES"
75CFLAGS+= $(SERF_CFLAGS)
76SHL1STDLIBS+=$(SERF_LIBS)
84.ELSE
85CFLAGS+= -I$(SOLARINCDIR)$/$(SERFINCDIR)
77.ELSE
78CFLAGS+= -I$(SOLARINCDIR)$/$(SERFINCDIR)
79SHL1STDLIBS+=$(INTERNAL_SERF_LIBS)
86.ENDIF
87
88.IF "$(SYSTEM_LIBXML)" == "YES"
89CFLAGS+= $(LIBXML_CFLAGS)
90.ELSE
91LIBXMLINCDIR=external$/libxml
92CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR)
93.ENDIF
94
95.IF "$(SYSTEM_OPENSSL)" == "YES"
96CFLAGS+= -I$(OPENSSL_CFLAGS)
80.ENDIF
81
82.IF "$(SYSTEM_LIBXML)" == "YES"
83CFLAGS+= $(LIBXML_CFLAGS)
84.ELSE
85LIBXMLINCDIR=external$/libxml
86CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR)
87.ENDIF
88
89.IF "$(SYSTEM_OPENSSL)" == "YES"
90CFLAGS+= -I$(OPENSSL_CFLAGS)
91SHL1STDLIBS+= $(OPENSSLLIB)
92.ELSE
93SHL1STDLIBS+= $(OPENSSLLIBST)
97.ENDIF
98
99# --- General -----------------------------------------------------
100
101SLOFILES=\
102 $(SLO)$/webdavservices.obj \
103 $(SLO)$/webdavprovider.obj \
104 $(SLO)$/webdavcontent.obj \

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

136
137# --- Shared-Library ---------------------------------------------------
138
139SHL1TARGET=$(TARGET)$(UCP_VERSION)
140SHL1IMPLIB=i$(TARGET)
141
142SHL1VERSIONMAP=$(SOLARENV)/src/component.map
143
94.ENDIF
95
96# --- General -----------------------------------------------------
97
98SLOFILES=\
99 $(SLO)$/webdavservices.obj \
100 $(SLO)$/webdavprovider.obj \
101 $(SLO)$/webdavcontent.obj \

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

133
134# --- Shared-Library ---------------------------------------------------
135
136SHL1TARGET=$(TARGET)$(UCP_VERSION)
137SHL1IMPLIB=i$(TARGET)
138
139SHL1VERSIONMAP=$(SOLARENV)/src/component.map
140
144SHL1STDLIBS=\
141SHL1STDLIBS+=\
145 $(CPPUHELPERLIB) \
146 $(CPPULIB) \
147 $(SALLIB) \
148 $(SALHELPERLIB) \
149 $(UCBHELPERLIB) \
150 $(COMPHELPERLIB) \
142 $(CPPUHELPERLIB) \
143 $(CPPULIB) \
144 $(SALLIB) \
145 $(SALHELPERLIB) \
146 $(UCBHELPERLIB) \
147 $(COMPHELPERLIB) \
151 $(SERFLIBS) \
152 $(LIBXML2LIB)
153
154.IF "$(GUI)"=="WNT"
155SHL1STDLIBS+= $(WSOCK32LIB)
156.IF "$(WINDOWS_VISTA_PSDK)" != ""
157SHL1STDLIBS+= $(WS2_32LIB)
158.ENDIF
148 $(LIBXML2LIB)
149
150.IF "$(GUI)"=="WNT"
151SHL1STDLIBS+= $(WSOCK32LIB)
152.IF "$(WINDOWS_VISTA_PSDK)" != ""
153SHL1STDLIBS+= $(WS2_32LIB)
154.ENDIF
159SHL1STDLIBS+= $(OPENSSLLIB)
160.ELSE # WNT
161.IF "$(OS)"=="SOLARIS"
162SHL1STDLIBS+= -lnsl -lsocket -ldl
163.ENDIF # SOLARIS
155.ELSE # WNT
156.IF "$(OS)"=="SOLARIS"
157SHL1STDLIBS+= -lnsl -lsocket -ldl
158.ENDIF # SOLARIS
164.IF "$(SYSTEM_OPENSSL)"=="YES"
165SHL1STDLIBS+= $(OPENSSLLIB)
166.ELSE
167SHL1STDLIBS+= $(OPENSSLLIBST)
168.ENDIF
169.ENDIF # WNT
170
171SHL1DEF=$(MISC)$/$(SHL1TARGET).def
172SHL1LIBS=$(LIB1TARGET)
173
174# --- Def-File ---------------------------------------------------------
175
176DEF1NAME=$(SHL1TARGET)

--- 13 unchanged lines hidden --- 		159.ENDIF # WNT
160
161SHL1DEF=$(MISC)$/$(SHL1TARGET).def
162SHL1LIBS=$(LIB1TARGET)
163
164# --- Def-File ---------------------------------------------------------
165
166DEF1NAME=$(SHL1TARGET)

--- 13 unchanged lines hidden ---