Changeset 12741

Show
Ignore:
Timestamp:
11/12/07 17:35:28 (9 months ago)
Author:
mloskot
Message:

Backported fix in building configuration of JP2KAK for libtool support to branches/1.4 (Ticket #1460)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.4/gdal/GDALmake.opt.in

    r12568 r12741  
    3636C_PROFFLAGS =   -g3 -pg -DDEBUG  
    3737 
    38 LIBS    =       @LIBS@ $(DWG_LIBS) $(SDE_LIB) $(CURL_LIB) $(IDB_LIB) 
     38LIBS    =       @LIBS@ $(KAK_LIBS) $(DWG_LIBS) $(SDE_LIB) $(CURL_LIB) $(IDB_LIB) 
    3939 
    4040PYTHON_INCLUDES = @PYTHON_INCLUDES@ 
    …… 
    172172# 
    173173KAKDIR = @KAKDIR@ 
     174 
     175ifneq (($KAKDIR),) 
     176ifeq ($(HAVE_LIBTOOL),yes) 
     177include $(GDAL_ROOT)/frmts/jp2kak/jp2kak.lst 
     178KAK_LIBS = $(KAK_OBJ) 
     179endif 
     180endif 
    174181 
    175182# 

  • branches/1.4/gdal/frmts/jp2kak/GNUmakefile

    r9871 r12741  
    11 
    22include ../../GDALmake.opt 
     3 
     4ifneq (($KAKDIR),) 
     5ifneq ($(HAVE_LIBTOOL),yes) 
     6include $(GDAL_ROOT)/frmts/jp2kak/jp2kak.lst 
     7endif 
     8endif 
    39 
    410OBJ     =       jp2kakdataset.o 
    …… 
    713        -I$(KAKDIR)/apps/jp2 -I$(KAKDIR)/apps/image -I$(KAKDIR)/apps/args  
    814 
    9 APPOBJ  = $(KAKDIR)/apps/make/args.o $(KAKDIR)/apps/make/image_in.o \ 
    10         $(KAKDIR)/apps/make/image_out.o $(KAKDIR)/apps/make/jp2.o \ 
    11         $(KAKDIR)/apps/make/mj2.o $(KAKDIR)/apps/make/palette.o \ 
    12         $(KAKDIR)/apps/make/roi_sources.o  
     15APPOBJ  = $(KAK_OBJ) 
    1316 
    1417# The following are just for Kakadu 5.1 or later.