Changeset 30297


Ignore:
Timestamp:
2015-10-09T17:05:03+13:00 (6 years ago)
Author:
jmt12
Message:

Altering the Makefile.in to determine whether it is in GSDL2 or GSDL3 and then setting appropriate paths to GDBM files. This replaces the configure stuff, which wasn't working and looked to tricky to make conditional

Location:
gs2-extensions/parallel-building/trunk/src/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • gs2-extensions/parallel-building/trunk/src/src/db2txtl-src/Makefile.in

    r24834 r30297  
    2929###########################################################################
    3030
    31 GSDL_DIR = ../../../..
     31ifndef GSDL3SRCHOME
     32  GSDL_DIR = ../../../..
     33else
     34  GSDL_DIR = ${GSDL3SRCHOME}/gs2build
     35endif
    3236COMMON_DIR = $(GSDL_DIR)/common-src
    33 
    3437COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
    3538
    3639CXX = @CXX@
    3740CXXFLAGS = @CXXFLAGS@
    38 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    39 INCLUDES = @GDBM_CFLAGS@ -I. -I$(COMMON_DIR)/src/lib -I${GEXTPARALLELBUILDING_INSTALLED}/include
     41DEFS = @DEFS@ $(JDBM_DEFINES) $(SQLITE_DEFINES)
     42INCLUDES = -I. -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib -I${GEXTPARALLELBUILDING_INSTALLED}/include
    4043INSTALL = @INSTALL@
    4144LDFLAGS = @LDFLAGS@ -L${GEXTPARALLELBUILDING_INSTALLED}/lib
    42 LIBS = -lm -lg @LIBS@ @GDBM_LIBS@ $(COMMON_DIR)/src/lib/gsdllib.a
     45LIBS = -lm -lg @LIBS@ -L$(COMMON_PACKAGES_DIR)/gdbm/lib -lgdbm $(COMMON_DIR)/src/lib/gsdllib.a
    4346
    4447
  • gs2-extensions/parallel-building/trunk/src/src/gdbmcli-src/Makefile.in

    r24639 r30297  
    4545###########################################################################
    4646
    47 GSDL_DIR = ../../../..
     47ifndef GSDL3SRCHOME
     48  GSDL_DIR = ../../../..
     49else
     50  GSDL_DIR = ${GSDL3SRCHOME}/gs2build
     51endif
    4852COMMON_DIR = $(GSDL_DIR)/common-src
    49 
    5053COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
    5154
    5255CXX = @CXX@
    5356CXXFLAGS = @CXXFLAGS@
    54 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    55 INCLUDES = -I. @GDBM_CFLAGS@ -I$(COMMON_DIR)/src/lib -I${GEXTPARALLELBUILDING_INSTALLED}/include
     57DEFS = @DEFS@ $(JDBM_DEFINES) $(SQLITE_DEFINES)
     58INCLUDES = -I. -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib -I${GEXTPARALLELBUILDING_INSTALLED}/include
    5659INSTALL = @INSTALL@
    5760LDFLAGS = @LDFLAGS@ -L${GEXTPARALLELBUILDING_INSTALLED}/lib
    58 LIBS = -lm -lg @LIBS@ @GDBM_LIBS@ $(COMMON_DIR)/src/lib/gsdllib.a
     61LIBS = -lm -lg @LIBS@ -L$(COMMON_PACKAGES_DIR)/gdbm/lib -lgdbm $(COMMON_DIR)/src/lib/gsdllib.a
    5962
    6063
  • gs2-extensions/parallel-building/trunk/src/src/txt2dbl-src/Makefile.in

    r24618 r30297  
    2929###########################################################################
    3030
    31 GSDL_DIR = ../../../..
     31ifndef GSDL3SRCHOME
     32  GSDL_DIR = ../../../..
     33else
     34  GSDL_DIR = ${GSDL3SRCHOME}/gs2build
     35endif
    3236COMMON_DIR = $(GSDL_DIR)/common-src
    3337
     
    3741CXXFLAGS = @CXXFLAGS@
    3842DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    39 INCLUDES = -I. @GDBM_CFLAGS@ -I$(COMMON_DIR)/src/lib -I${GEXTPARALLELBUILDING_INSTALLED}/include
     43INCLUDES = -I. -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib -I${GEXTPARALLELBUILDING_INSTALLED}/include
    4044INSTALL = @INSTALL@
    4145LDFLAGS = @LDFLAGS@ -L${GEXTPARALLELBUILDING_INSTALLED}/lib
    42 LIBS = -lm -lg @LIBS@ @GDBM_LIBS@ $(COMMON_DIR)/src/lib/gsdllib.a
     46LIBS = -lm -lg @LIBS@ -L$(COMMON_PACKAGES_DIR)/gdbm/lib -lgdbm $(COMMON_DIR)/src/lib/gsdllib.a
    4347
    4448
Note: See TracChangeset for help on using the changeset viewer.