Changeset 7325 in project


Ignore:
Timestamp:
01/09/08 08:48:52 (12 years ago)
Author:
felix winkelmann
Message:

moved PCRE check into defaults.make

Location:
chicken/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • chicken/trunk/Makefile.linux

    r7309 r7325  
    5151LIBRARIES = -lm -ldl
    5252NEEDS_RELINKING = yes
    53 
    54 ifneq ($(USE_HOST_PCRE),)
    55 LIBRARIES       += -lpcre
    56 PCRE_INCLUDES   ?=
    57 C_COMPILER_PCRE_OPTIONS ?=
    58 PCRE_OBJECTS_1 =
    59 endif
    6053
    6154
  • chicken/trunk/README

    r7278 r7325  
    149149          the one on which you are building it.
    150150
    151         TARGETSYSTEM=
    152           Similar to "HOSTSYSTEM", but specifies the name prefix to use for compiling
    153           code with the "csc" compiler driver. This is required for creating
    154           a "cross chicken", a specially built CHICKEN that invokes a cross
    155           C compiler to build the final binaries. You will need a cross compiled
    156           runtime system by building a version of CHICKEN with the "HOST" option
    157           mentioned above. More information about this process and the variables
    158           that you should set are provided in the CHICKEN wiki at
    159           <http://chicken.wiki.br/cross-compilation>.
     151        TARGETSYSTEM=
     152          Similar to "HOSTSYSTEM", but specifies the name
     153          prefix to use for compiling code with the "csc" compiler
     154          driver. This is required for creating a "cross chicken", a
     155          specially built CHICKEN that invokes a cross C compiler to
     156          build the final binaries. You will need a cross compiled
     157          runtime system by building a version of CHICKEN with the
     158          "HOST" option mentioned above. More information about this
     159          process and the variables that you should set are provided
     160          in the CHICKEN wiki at
     161          <http://chicken.wiki.br/cross-compilation>.
     162
     163        USE_HOST_PCRE=
     164          The PCRE library is included with the CHICKEN
     165          distribution to remove external dependencies and to avoid
     166          incompatibilities with any previously installed version. If
     167          you want to link with an installed libpcre, set this
     168          variable to a non-empty value. Only use this feature if you
     169          know what you are doing.
    160170
    161171        To remove CHICKEN from your file-system, enter (probably as
  • chicken/trunk/defaults.make

    r7187 r7325  
    145145# options
    146146
     147ifneq ($(USE_HOST_PCRE),)
     148LIBRARIES += -lpcre
     149PCRE_INCLUDES =
     150C_COMPILER_PCRE_OPTIONS =
     151PCRE_OBJECTS_1 =
     152else
     153C_COMPILER_PCRE_OPTIONS = -DPCRE_STATIC
     154PCRE_INCLUDES = $(INCLUDES) -Ipcre
     155endif
    147156ifndef NOPTABLES
    148157C_COMPILER_PTABLES_OPTIONS = -DC_ENABLE_PTABLES
    149158endif
    150159INCLUDES ?= -I.
    151 PCRE_INCLUDES ?= $(INCLUDES) -Ipcre
    152160C_COMPILER_COMPILE_OPTION ?= -c
    153161C_COMPILER_OUTPUT_OPTION ?= -o
     
    157165C_COMPILER_BUILD_RUNTIME_OPTIONS ?= -DC_BUILDING_LIBCHICKEN
    158166C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS ?= $(C_COMPILER_BUILD_RUNTIME_OPTIONS) -DNDEBUG -DC_UNSAFE_RUNTIME
    159 C_COMPILER_PCRE_OPTIONS ?= -DPCRE_STATIC
    160167C_COMPILER_SHARED_OPTIONS ?= -fPIC -DPIC
    161168LINKER_EXECUTABLE_OPTIONS ?= -L.
     
    220227endif
    221228
     229
    222230# file extensions
    223231
     
    231239POSIXFILE ?= posixunix
    232240CHICKEN_CONFIG_H = chicken-config.h
    233 PCRE_OBJECT_FILES ?= pcre/*.o
    234241
    235242ifneq ($(ARCH),)
Note: See TracChangeset for help on using the changeset viewer.