@@ -49,6 +49,11 @@ MAKE_OPT = -s
49
49
BDIR = $(BROOTDIR ) /$(TARGET ) /release
50
50
endif
51
51
52
+ LIBAWS_TYPES =static
53
+ ifeq (${ENABLE_SHARED},true)
54
+ LIBAWS_TYPES =static relocatable static-pic
55
+ endif
56
+
52
57
# ############################################################################
53
58
# NO NEED TO CHANGE ANYTHING PAST THIS POINT
54
59
# ############################################################################
@@ -173,10 +178,6 @@ GPROPTS = -XPRJ_BUILD=$(PRJ_BUILD) -XPRJ_SOCKLIB=$(PRJ_SOCKLIB) \
173
178
174
179
GPR_STATIC = -XLIBRARY_TYPE=static -XXMLADA_BUILD=static
175
180
GPR_SHARED = -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
176
- GPR_OTHER = -XLIBRARY_TYPE=$(OTHER_LIBRARY_TYPE ) \
177
- -XXMLADA_BUILD=$(OTHER_LIBRARY_TYPE )
178
- GPR_DEFAULT = -XLIBRARY_TYPE=$(DEFAULT_LIBRARY_TYPE ) \
179
- -XXMLADA_BUILD=$(DEFAULT_LIBRARY_TYPE )
180
181
181
182
# ######################################################################
182
183
# build
@@ -190,11 +191,11 @@ build-awsres-tool-native:
190
191
build-tools-native : gen-templates build-lib-native
191
192
$(GPRBUILD ) -p $(GPROPTS ) $(GPR_STATIC ) tools/tools.gpr
192
193
193
- build-lib-native :
194
- $(GPRBUILD ) -p $(GPROPTS ) aws.gpr
195
- ifeq (${ENABLE_SHARED}, true)
196
- $(GPRBUILD) -p $(GPROPTS) $(GPR_SHARED) aws.gpr
197
- endif
194
+ build-libs- % :
195
+ $(GPRBUILD ) -p $(GPROPTS ) \
196
+ -XLIBRARY_TYPE= $* -XXMLADA_BUILD= $* aws.gpr
197
+
198
+ build-lib-native : ${LIBAWS_TYPES: % =build-libs- % }
198
199
199
200
build-gps-support : build-lib-native
200
201
$(GPRBUILD ) -p $(GPROPTS ) $(GPR_STATIC ) gps/gps_support.gpr
@@ -206,12 +207,11 @@ build-tools-cross: build-lib-cross
206
207
$(GPRBUILD ) -p --target=$(TARGET ) $(GPROPTS ) \
207
208
$(GPR_STATIC ) tools/tools.gpr
208
209
209
- build-lib-cross :
210
- $(GPRBUILD ) -p --target=$(TARGET ) $(GPROPTS ) aws.gpr
211
- ifeq (${ENABLE_SHARED}, true)
210
+ build-libs-cross-% :
212
211
$(GPRBUILD ) -p --target=$(TARGET ) $(GPROPTS ) \
213
- $(GPR_SHARED) aws.gpr
214
- endif
212
+ -XLIBRARY_TYPE=$* -XXMLADA_BUILD=$* aws.gpr
213
+
214
+ build-lib-cross : ${LIBAWS_TYPES:% =build-libs-cross-% }
215
215
216
216
build-dynamo :
217
217
make -C config build-dynamo
@@ -234,18 +234,20 @@ gps: setup
234
234
# ######################################################################
235
235
# clean
236
236
237
- clean-native :
237
+ clean-libs-% :
238
+ $(GPRCLEAN ) $(GPROPTS ) -XLIBRARY_TYPE=$* -XXMLADA_BUILD=$* aws.gpr
239
+
240
+ clean-lib-native : ${LIBAWS_TYPES:% =clean-libs-% }
241
+
242
+ clean-native : clean-libs-native
238
243
-$(GPRCLEAN ) $(GPROPTS ) $(GPR_STATIC ) tools/tools.gpr
239
- ifeq (${ENABLE_SHARED}, true)
240
- -$(GPRCLEAN) $(GPROPTS) $(GPR_SHARED) aws.gpr
241
- endif
242
244
-$(GPRCLEAN ) $(GPROPTS ) $(GPR_STATIC ) gps/gps_support.gpr
243
245
244
- clean-cross :
245
- - $(GPRCLEAN ) $( GPROPTS ) --target=$(TARGET ) $( GPR_STATIC ) aws.gpr
246
- ifeq (${ENABLE_SHARED}, true)
247
- -$(GPRCLEAN) $(GPROPTS) --target=$(TARGET) $(GPR_SHARED) aws.gpr
248
- endif
246
+ clean-libs- cross- % :
247
+ $(GPRCLEAN ) --target=$(TARGET ) \
248
+ -XLIBRARY_TYPE= $* -XXMLADA_BUILD= $* aws.gpr
249
+
250
+ clean-cross : ${LIBAWS_TYPES: % =clean-libs-cross- % }
249
251
250
252
ifeq (${IS_CROSS}, true)
251
253
clean : clean-cross
@@ -268,36 +270,33 @@ endif
268
270
GPRINST_OPTS =-p -f --prefix=$(TPREFIX ) \
269
271
--build-var=LIBRARY_TYPE --build-var=AWS_BUILD
270
272
271
- install-lib-native :
272
- $(GPRINSTALL ) $(GPROPTS ) $(GPRINST_OPTS ) $(GPR_DEFAULT ) \
273
- --build-name=$(DEFAULT_LIBRARY_TYPE ) aws.gpr
274
- ifeq (${ENABLE_SHARED}, true)
273
+ install-libs-% :
275
274
$(GPRINSTALL ) $(GPROPTS ) $(GPRINST_OPTS ) \
276
- $(GPR_OTHER) --build-name=$(OTHER_LIBRARY_TYPE) aws.gpr
277
- endif
275
+ -XLIBRARY_TYPE=$* -XXMLADA_BUILD=$* \
276
+ --build-name=$* aws.gpr
277
+
278
+ install-lib-native : ${LIBAWS_TYPES:% =install-libs-% }
278
279
279
280
install-tools-native :
280
281
$(GPRINSTALL ) $(GPROPTS ) $(GPRINST_OPTS ) $(GPR_STATIC ) --mode=usage \
281
- --build-name=$( DEFAULT_LIBRARY_TYPE ) \
282
+ --build-name=static \
282
283
--install-name=aws tools/tools.gpr
283
284
284
- install-native : install-clean install-lib -native install-tools-native
285
+ install-native : install-clean install-libs -native install-tools-native
285
286
286
- install-lib-cross :
287
- $(GPRINSTALL ) $(GPROPTS ) $(GPRINST_OPTS ) \
288
- --target=$(TARGET ) $(GPR_DEFAULT ) aws.gpr
289
- ifeq (${ENABLE_SHARED}, true)
287
+ install-libs-cross-% :
290
288
$(GPRINSTALL ) $(GPROPTS ) $(GPRINST_OPTS ) \
291
- --target=$(TARGET) $(GPR_OTHER) \
292
- --build-name=$(OTHER_LIBRARY_TYPE) aws.gpr
293
- endif
289
+ --target=$(TARGET ) -XLIBRARY_TYPE=$* -XXMLADA_BUILD=$* \
290
+ --build-name=$* aws.gpr
291
+
292
+ install-lib-cross : ${LIBAWS_TYPES:% =install-libs-cross-% }
294
293
295
294
install-tools-cross :
296
295
$(GPRINSTALL ) $(GPROPTS ) $(GPRINST_OPTS ) --mode=usage \
297
296
--target=$(TARGET ) $(GPROPTS ) \
298
297
--install-name=aws tools/tools.gpr
299
298
300
- install-cross : install-clean install-lib -cross install-tools-cross
299
+ install-cross : install-clean install-libs -cross install-tools-cross
301
300
302
301
ifeq (${IS_CROSS}, true)
303
302
install : install-cross
@@ -368,7 +367,6 @@ setup_modules: $(MODULES_SETUP)
368
367
369
368
gen_setup :
370
369
echo " prefix=$( prefix) " > makefile.setup
371
- echo " DEFAULT_LIBRARY_TYPE=$( DEFAULT_LIBRARY_TYPE) " >> makefile.setup
372
370
echo " ENABLE_SHARED=$( ENABLE_SHARED) " >> makefile.setup
373
371
echo " ZLIB=$( ZLIB) " >> makefile.setup
374
372
echo " XMLADA=$( XMLADA) " >> makefile.setup
0 commit comments