← Back to branch summary

~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to lib/inets/src/http_lib/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2011-05-05 15:48:43 UTC
  • mfrom: (3.5.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
Tags: 1:14.b.2-dfsg-3ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to.
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.
  - debian/patches/series: Do what I meant, and enable build-options.patch
    instead.
* Additional changes:
  - Drop erlang-wx from -et
* Dropped Changes:
  - patches/pcre-crash.patch: CVE-2008-2371: outer level option with
    alternatives caused crash. (Applied Upstream)
  - fix for ssl certificate verification in newSSL: 
    ssl_cacertfile_fix.patch (Applied Upstream)
  - debian/patches/series: Enable native.patch again, to get stripped beam
    files and reduce the package size again. (build-options is what
    actually accomplished this)
  - Remove build-options.patch on advice from upstream and because it caused
    odd build failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/inets/src/http_lib/Makefile
1
1
#
2
2
# %CopyrightBegin%
3
 
# 
4
 
# Copyright Ericsson AB 2005-2009. All Rights Reserved.
5
 
# 
 
3
#
 
4
# Copyright Ericsson AB 2005-2010. All Rights Reserved.
 
5
#
6
6
# The contents of this file are subject to the Erlang Public License,
7
7
# Version 1.1, (the "License"); you may not use this file except in
8
8
# compliance with the License. You should have received a copy of the
9
9
# Erlang Public License along with this software. If not, it can be
10
10
# retrieved online at http://www.erlang.org/.
11
 
# 
 
11
#
12
12
# Software distributed under the License is distributed on an "AS IS"
13
13
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
14
14
# the License for the specific language governing rights and limitations
15
15
# under the License.
16
 
# 
 
16
#
17
17
# %CopyrightEnd%
18
18
#
19
19
#
22
22
EBIN = ../../ebin
23
23
include $(ERL_TOP)/make/$(TARGET)/otp.mk
24
24
 
 
25
 
25
26
# ----------------------------------------------------
26
27
# Application version
27
28
# ----------------------------------------------------
29
30
 
30
31
VSN = $(INETS_VSN)
31
32
 
 
33
 
32
34
# ----------------------------------------------------
33
35
# Release directory specification
34
36
# ----------------------------------------------------
35
 
RELSYSDIR = $(RELEASE_PATH)/lib/inets-$(VSN)
 
37
RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 
38
 
36
39
 
37
40
# ----------------------------------------------------
38
41
# Target Specs
42
45
        http_transport\
43
46
        http_util \
44
47
        http_request \
45
 
        http_response
 
48
        http_response \
 
49
        http_uri
46
50
 
47
51
HRL_FILES = http_internal.hrl
48
52
 
50
54
 
51
55
TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) 
52
56
 
53
 
# ----------------------------------------------------
54
 
# INETS FLAGS
55
 
# ----------------------------------------------------
56
 
INETS_FLAGS = -D'SERVER_SOFTWARE="inets/$(VSN)"' \
57
57
 
58
58
# ----------------------------------------------------
59
59
# FLAGS
60
60
# ----------------------------------------------------
61
 
INETS_ERL_FLAGS +=  -I ../inets_app
62
 
 
63
 
ifeq ($(WARN_UNUSED_WARS),true)
64
 
ERL_COMPILE_FLAGS += +warn_unused_vars
65
 
endif
66
 
 
67
 
ERL_COMPILE_FLAGS += $(INETS_ERL_FLAGS) \
68
 
                     $(INETS_FLAGS) \
69
 
                     +'{parse_transform,sys_pre_attributes}' \
70
 
                     +'{attribute,insert,app_vsn,$(APP_VSN)}'
 
61
 
 
62
include ../inets_app/inets.mk
 
63
 
 
64
ERL_COMPILE_FLAGS += \
 
65
        $(INETS_FLAGS) \
 
66
        $(INETS_ERL_COMPILE_FLAGS) \
 
67
        -I../../include \
 
68
        -I../inets_app
71
69
 
72
70
 
73
71
# ----------------------------------------------------
82
80
 
83
81
docs:
84
82
 
 
83
 
85
84
# ----------------------------------------------------
86
85
# Release Target
87
86
# ---------------------------------------------------- 
88
87
include $(ERL_TOP)/make/otp_release_targets.mk
89
88
 
90
89
release_spec: opt
91
 
        $(INSTALL_DIR) $(RELSYSDIR)/src
92
 
        $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
93
 
        $(INSTALL_DIR) $(RELSYSDIR)/ebin
 
90
        $(INSTALL_DIR)  $(RELSYSDIR)/src
 
91
        $(INSTALL_DIR)  $(RELSYSDIR)/src/http_lib
 
92
        $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_lib
 
93
        $(INSTALL_DIR)  $(RELSYSDIR)/ebin
94
94
        $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
95
95
 
96
96
release_docs_spec:
97
97
 
98
98
info:
 
99
        @echo "APPLICATION       = $(APPLICATION)"
99
100
        @echo "INETS_DEBUG       = $(INETS_DEBUG)"
100
101
        @echo "INETS_FLAGS       = $(INETS_FLAGS)"
101
102
        @echo "ERL_COMPILE_FLAGS = $(ERL_COMPILE_FLAGS)"
 
103