← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/inets/src/tftp/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/tftp/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
#
33
33
# ----------------------------------------------------
34
34
# Release directory specification
35
35
# ----------------------------------------------------
36
 
RELSYSDIR = $(RELEASE_PATH)/lib/inets-$(VSN)
 
36
RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 
37
 
37
38
 
38
39
# ----------------------------------------------------
39
40
# Target Specs
53
54
 
54
55
TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
55
56
 
56
 
# ----------------------------------------------------
57
 
# INETS FLAGS
58
 
# ----------------------------------------------------
59
 
INETS_FLAGS = -D'SERVER_SOFTWARE="inets/$(VSN)"' \
60
57
 
61
58
# ----------------------------------------------------
62
59
# FLAGS
63
60
# ----------------------------------------------------
64
 
ERL_COMPILE_FLAGS += $(INETS_FLAGS) \
65
 
                     +'{parse_transform,sys_pre_attributes}' \
66
 
                     +'{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
 
69
 
 
70
 
67
71
# ----------------------------------------------------
68
72
# Targets
69
73
# ----------------------------------------------------
82
86
include $(ERL_TOP)/make/otp_release_targets.mk
83
87
 
84
88
release_spec: opt
85
 
        $(INSTALL_DIR) $(RELSYSDIR)/src
86
 
        $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
87
 
        $(INSTALL_DIR) $(RELSYSDIR)/ebin
 
89
        $(INSTALL_DIR)  $(RELSYSDIR)/src
 
90
        $(INSTALL_DIR)  $(RELSYSDIR)/src/tftp
 
91
        $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/tftp
 
92
        $(INSTALL_DIR)  $(RELSYSDIR)/ebin
88
93
        $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
89
94
 
90
95
release_docs_spec:
91
96
 
92
97
info:
 
98
        @echo "APPLICATION       = $(APPLICATION)"
93
99
        @echo "INETS_DEBUG       = $(INETS_DEBUG)"
94
100
        @echo "INETS_FLAGS       = $(INETS_FLAGS)"
95
101
        @echo "ERL_COMPILE_FLAGS = $(ERL_COMPILE_FLAGS)"