Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 471250 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile.in (-18 / +18 lines)
Lines 264-270 Link Here
264
	  $(APR_LIB)
264
	  $(APR_LIB)
265
265
266
266
267
EXE_LDFLAGS =	$(RUNPATHS) -lmapserver $(SUP_LIBS)
267
EXE_LIBS =	$(RUNPATHS) -lmapserver $(SUP_LIBS)
268
268
269
RM= /bin/rm -f
269
RM= /bin/rm -f
270
270
Lines 415-421 Link Here
415
	echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars
415
	echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars
416
	echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars
416
	echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars
417
	echo $(LIBMAP) >> mapscriptvars
417
	echo $(LIBMAP) >> mapscriptvars
418
	echo $(EXE_LDFLAGS) >> mapscriptvars
418
	echo $(EXE_LIBS) >> mapscriptvars
419
	grep '#define MS_VERSION ' mapserver.h >> mapscriptvars
419
	grep '#define MS_VERSION ' mapserver.h >> mapscriptvars
420
420
421
mapserver-config: Makefile
421
mapserver-config: Makefile
Lines 362-413 Link Here
362
	$(LINK) -release $(MS_VERSION)  $(OBJS) $(SUP_LIBS) -o $(LIBMAP)
362
	$(LINK) -release $(MS_VERSION)  $(OBJS) $(SUP_LIBS) -o $(LIBMAP)
363
363
364
shp2pdf: $(LIBMAP) shp2pdf.$(OBJ_SUFFIX)
364
shp2pdf: $(LIBMAP) shp2pdf.$(OBJ_SUFFIX)
365
	$(LINK) shp2pdf.$(OBJ_SUFFIX) $(LIBMAP) -o shp2pdf
365
	$(LINK) shp2pdf.$(OBJ_SUFFIX) $(LDFLAGS) $(LIBMAP) -o shp2pdf
366
366
367
shp2img: $(LIBMAP) shp2img.$(OBJ_SUFFIX)
367
shp2img: $(LIBMAP) shp2img.$(OBJ_SUFFIX)
368
	$(LINK) shp2img.$(OBJ_SUFFIX) $(LIBMAP) -o shp2img
368
	$(LINK) shp2img.$(OBJ_SUFFIX) $(LDFLAGS) $(LIBMAP) -o shp2img
369
369
370
sym2img:  sym2img.$(OBJ_SUFFIX) $(LIBMAP)
370
sym2img:  sym2img.$(OBJ_SUFFIX) $(LIBMAP)
371
	$(LINK) sym2img.$(OBJ_SUFFIX) $(LIBMAP) -o sym2img
371
	$(LINK) sym2img.$(OBJ_SUFFIX) $(LDFLAGS) $(LIBMAP) -o sym2img
372
372
373
legend: legend.$(OBJ_SUFFIX) $(LIBMAP)
373
legend: legend.$(OBJ_SUFFIX) $(LIBMAP)
374
	$(LINK) legend.$(OBJ_SUFFIX) $(LIBMAP) -o legend
374
	$(LINK) legend.$(OBJ_SUFFIX) $(LDFLAGS) $(LIBMAP) -o legend
375
375
376
scalebar: scalebar.$(OBJ_SUFFIX) $(LIBMAP)
376
scalebar: scalebar.$(OBJ_SUFFIX) $(LIBMAP)
377
	$(LINK) scalebar.$(OBJ_SUFFIX) $(LIBMAP) -o scalebar
377
	$(LINK) scalebar.$(OBJ_SUFFIX) $(LDFLAGS) $(LIBMAP) -o scalebar
378
378
379
mapserv: mapserv.$(OBJ_SUFFIX) $(LIBMAP)
379
mapserv: mapserv.$(OBJ_SUFFIX) $(LIBMAP)
380
	$(LINK) mapserv.$(OBJ_SUFFIX) $(LIBMAP) $(FASTCGI_LIB) -o mapserv
380
	$(LINK) mapserv.$(OBJ_SUFFIX) $(LDFLAGS) $(LIBMAP) $(FASTCGI_LIB) -o mapserv
381
381
382
shpindex: shpindex.$(OBJ_SUFFIX) $(LIBMAP)
382
shpindex: shpindex.$(OBJ_SUFFIX) $(LIBMAP)
383
	$(LINK) shpindex.$(OBJ_SUFFIX) $(LIBMAP) -o shpindex
383
	$(LINK) shpindex.$(OBJ_SUFFIX) $(LDFLAGS) $(LIBMAP) -o shpindex
384
384
385
shptree: shptree.$(OBJ_SUFFIX) $(LIBMAP)
385
shptree: shptree.$(OBJ_SUFFIX) $(LIBMAP)
386
	$(LINK) shptree.$(OBJ_SUFFIX) $(LIBMAP) -o shptree
386
	$(LINK) shptree.$(OBJ_SUFFIX) $(LDFLAGS) $(LIBMAP) -o shptree
387
387
388
shptreevis: shptreevis.$(OBJ_SUFFIX) $(LIBMAP)
388
shptreevis: shptreevis.$(OBJ_SUFFIX) $(LIBMAP)
389
	$(LINK) shptreevis.$(OBJ_SUFFIX) $(LIBMAP) -o shptreevis
389
	$(LINK) shptreevis.$(OBJ_SUFFIX) $(LDFLAGS) $(LIBMAP) -o shptreevis
390
390
391
shptreetst: shptreetst.$(OBJ_SUFFIX) $(LIBMAP)
391
shptreetst: shptreetst.$(OBJ_SUFFIX) $(LIBMAP)
392
	$(LINK) shptreetst.$(OBJ_SUFFIX) $(LIBMAP) -o shptreetst
392
	$(LINK) shptreetst.$(OBJ_SUFFIX) $(LDFLAGS) $(LIBMAP) -o shptreetst
393
393
394
sortshp: sortshp.$(OBJ_SUFFIX) $(LIBMAP)
394
sortshp: sortshp.$(OBJ_SUFFIX) $(LIBMAP)
395
	$(LINK) sortshp.$(OBJ_SUFFIX) $(LIBMAP) -o sortshp
395
	$(LINK) sortshp.$(OBJ_SUFFIX) $(LDFLAGS) $(LIBMAP) -o sortshp
396
396
397
tile4ms: tile4ms.$(OBJ_SUFFIX) $(LIBMAP)
397
tile4ms: tile4ms.$(OBJ_SUFFIX) $(LIBMAP)
398
	$(LINK) tile4ms.$(OBJ_SUFFIX) $(LIBMAP) -o tile4ms
398
	$(LINK) tile4ms.$(OBJ_SUFFIX) $(LDFLAGS) $(LIBMAP) -o tile4ms
399
399
400
msencrypt: msencrypt.$(OBJ_SUFFIX) $(LIBMAP)
400
msencrypt: msencrypt.$(OBJ_SUFFIX) $(LIBMAP)
401
	$(LINK) msencrypt.$(OBJ_SUFFIX) $(LIBMAP) -o msencrypt
401
	$(LINK) msencrypt.$(OBJ_SUFFIX) $(LDFLAGS) $(LIBMAP) -o msencrypt
402
402
403
testexpr: testexpr.$(OBJ_SUFFIX) mapparser.$(OBJ_SUFFIX) maplexer.$(OBJ_SUFFIX) $(LIBMAP)
403
testexpr: testexpr.$(OBJ_SUFFIX) mapparser.$(OBJ_SUFFIX) maplexer.$(OBJ_SUFFIX) $(LIBMAP)
404
	$(LINK) testexpr.$(OBJ_SUFFIX) $(LIBMAP) -o testexpr
404
	$(LINK) testexpr.$(OBJ_SUFFIX) $(LDFLAGS) $(LIBMAP) -o testexpr
405
405
406
testcopy: testcopy.$(OBJ_SUFFIX) $(LIBMAP)
406
testcopy: testcopy.$(OBJ_SUFFIX) $(LIBMAP)
407
	$(LINK) testcopy.$(OBJ_SUFFIX) $(LIBMAP) -o testcopy
407
	$(LINK) testcopy.$(OBJ_SUFFIX) $(LDFLAGS) $(LIBMAP) -o testcopy
408
408
409
test_mapcrypto: mapcrypto.c mapserver.h $(LIBMAP)
409
test_mapcrypto: mapcrypto.c mapserver.h $(LIBMAP)
410
	$(LINK) mapcrypto.c -DTEST_MAPCRYPTO $(LIBMAP) -o test_mapcrypto
410
	$(LINK) mapcrypto.c -DTEST_MAPCRYPTO $(LDFLAGS) $(LIBMAP) -o test_mapcrypto
411
411
412
mapscriptvars:	Makefile
412
mapscriptvars:	Makefile
413
	touch mapscriptvars
413
	touch mapscriptvars

Return to bug 471250