← Back to branch summary

~clint-fewbar/ubuntu/precise/erlang/merge-15b

« back to all changes in this revision

Viewing changes to lib/typer/src/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/typer/src/Makefile
1
1
#
2
2
# %CopyrightBegin%
3
3
# 
4
 
# Copyright Ericsson AB 2006-2009. All Rights Reserved.
 
4
# Copyright Ericsson AB 2006-2011. All Rights Reserved.
5
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
45
45
# ----------------------------------------------------
46
46
# Target Specs
47
47
# ----------------------------------------------------
48
 
MODULES =  \
49
 
        typer \
50
 
        typer_annotator \
51
 
        typer_info \
52
 
        typer_map \
53
 
        typer_options \
54
 
        typer_preprocess
 
48
MODULES = typer
55
49
 
56
 
HRL_FILES= typer.hrl
 
50
HRL_FILES=
57
51
ERL_FILES= $(MODULES:%=%.erl)
58
52
INSTALL_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
59
53
TARGET_FILES= $(INSTALL_FILES)
87
81
# Special Build Targets
88
82
# ----------------------------------------------------
89
83
 
90
 
$(EBIN)/typer_options.$(EMULATOR): typer_options.erl ../vsn.mk Makefile
91
 
        erlc -W  $(ERL_COMPILE_FLAGS) -DVSN="\"v$(VSN)\"" -o$(EBIN) typer_options.erl
 
84
$(EBIN)/typer.$(EMULATOR): typer.erl ../vsn.mk Makefile
 
85
        erlc -W  $(ERL_COMPILE_FLAGS) -DVSN="\"v$(VSN)\"" -o$(EBIN) typer.erl
92
86
 
93
87
$(APP_TARGET): $(APP_SRC) ../vsn.mk
94
88
        sed -e 's;%VSN%;$(VSN);' $< > $@
97
91
        sed -e 's;%VSN%;$(VSN);' $< > $@
98
92
 
99
93
# ---------------------------------------------------------------------
100
 
# dependencies -- I wish they were somehow automatically generated
 
94
# dependencies
101
95
# ---------------------------------------------------------------------
102
96
 
103
 
$(EBIN)/typer.beam: typer.hrl
104
 
$(EBIN)/typer_annotator.beam: typer.hrl
105
 
$(EBIN)/typer_info.beam: typer.hrl
106
 
$(EBIN)/typer_options.beam: typer.hrl
107
 
$(EBIN)/typer_preprocess.beam: typer.hrl
108
97
 
109
98
# ----------------------------------------------------
110
99
# Release Target