components/apr/Makefile
changeset 206 a4474882bf60
parent 203 887f23af6934
child 267 f7eb7d0199e2
equal deleted inserted replaced
205:777251fa3676 206:a4474882bf60
    33 include ../../make-rules/configure.mk
    33 include ../../make-rules/configure.mk
    34 include ../../make-rules/ips.mk
    34 include ../../make-rules/ips.mk
    35 
    35 
    36 PATCH_LEVEL=0
    36 PATCH_LEVEL=0
    37 
    37 
    38 APR_PREFIX=/usr/apr/1.3
    38 CONFIGURE_PREFIX=/usr/apr/1.3
    39 
    39 
    40 # CONFIGURE_OPTIONS need to be reset so that pre-defined layout can be
       
    41 # used without being overwritten with default configure paths.
       
    42 CONFIGURE_OPTIONS  =	--prefix=$(APR_PREFIX)
       
    43 CONFIGURE_OPTIONS +=	--enable-threads
    40 CONFIGURE_OPTIONS +=	--enable-threads
    44 CONFIGURE_OPTIONS +=	--enable-other-child
    41 CONFIGURE_OPTIONS +=	--enable-other-child
    45 CONFIGURE_OPTIONS +=	--enable-nonportable-atomics
    42 CONFIGURE_OPTIONS +=	--enable-nonportable-atomics
    46 CONFIGURE_OPTIONS +=	--enable-shared
    43 CONFIGURE_OPTIONS +=	--enable-shared
    47 CONFIGURE_OPTIONS +=	CC="$(CC)"
       
    48 CONFIGURE_OPTIONS +=	CXX="$(CCC)"
       
    49 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS) -DSSL_EXPERIMENTAL -DSSL_ENGINE"
    44 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS) -DSSL_EXPERIMENTAL -DSSL_ENGINE"
    50 CONFIGURE_OPTIONS +=	LTFLAGS="--tag=CC --silent"
    45 CONFIGURE_OPTIONS +=	LTFLAGS="--tag=CC --silent"
    51 CONFIGURE_OPTIONS +=	$(CONFIGURE_OPTIONS.$(BITS))
       
    52 CONFIGURE_OPTIONS.32 +=	--enable-layout=OpenSolaris
    46 CONFIGURE_OPTIONS.32 +=	--enable-layout=OpenSolaris
    53 CONFIGURE_OPTIONS.64 +=	--enable-layout=OpenSolaris-$(MACH64)
    47 CONFIGURE_OPTIONS.64 +=	--enable-layout=OpenSolaris-$(MACH64)
    54 CONFIGURE_OPTIONS.32 +=	--with-installbuilddir=$(APR_PREFIX)/build
    48 CONFIGURE_OPTIONS.32 +=	--with-installbuilddir=$(CONFIGURE_PREFIX)/build
    55 CONFIGURE_OPTIONS.64 +=	--with-installbuilddir=$(APR_PREFIX)/build/$(MACH64)
    49 CONFIGURE_OPTIONS.64 +=	--with-installbuilddir=$(CONFIGURE_PREFIX)/build/$(MACH64)
    56 
    50 
    57 COMPONENT_TEST_TARGETS=	test
    51 COMPONENT_TEST_TARGETS=	test
    58 
    52 
    59 # We need this to keep doxygen happy (for include/ and docs/ contents).
    53 # We need this to keep doxygen happy (for include/ and docs/ contents).
    60 COMPONENT_PRE_CONFIGURE_ACTION += ($(CLONEY) $(SOURCE_DIR) $(@D));
    54 COMPONENT_PRE_CONFIGURE_ACTION += ($(CLONEY) $(SOURCE_DIR) $(@D));
    69 	  $(BUILD_DIR_64)/$(APRH) > $(PROTO_DIR)/$(APR_PREFIX)/$(APRH); true
    63 	  $(BUILD_DIR_64)/$(APRH) > $(PROTO_DIR)/$(APR_PREFIX)/$(APRH); true
    70 
    64 
    71 # Documentation is generated in and directly packaged from 32 bit build
    65 # Documentation is generated in and directly packaged from 32 bit build
    72 # directory using doxygen.
    66 # directory using doxygen.
    73 PKG_PROTO_DIRS += $(BUILD_DIR_32)/docs/dox/html
    67 PKG_PROTO_DIRS += $(BUILD_DIR_32)/docs/dox/html
    74 PUBLISH_TRANSFORMS += doc-transform
    68 
    75 docs: $(BUILD_DIR_32)/.built
    69 docs: $(BUILD_DIR_32)/.built
    76 	cd $(BUILD_DIR_32); doxygen docs/doxygen.conf
    70 	cd $(BUILD_DIR_32); doxygen docs/doxygen.conf
    77 
    71 
    78 build: $(BUILD_32_and_64) docs
    72 build: $(BUILD_32_and_64) docs
    79 
    73