← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/observer/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/observer/src/Makefile
1
1
#
2
2
# %CopyrightBegin%
3
3
# 
4
 
# Copyright Ericsson AB 2002-2009. All Rights Reserved.
 
4
# Copyright Ericsson AB 2002-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
59
59
EXECUTABLES= \
60
60
        $(BINDIR)/etop \
61
61
        $(BINDIR)/getop \
 
62
        $(BINDIR)/cdv \
62
63
        $(BINDIR)/etop.bat \
63
 
        $(BINDIR)/getop.bat
 
64
        $(BINDIR)/getop.bat \
 
65
        $(BINDIR)/cdv.bat
64
66
CDVDIR= $(PRIVDIR)/crashdump_viewer
65
67
GIF_FILES= \
66
68
        $(CDVDIR)/collapsd.gif \
111
113
        $(INSTALL_DIR) $(RELSYSDIR)/src
112
114
        $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
113
115
        $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
114
 
        $(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/src
 
116
        $(INSTALL_DIR) $(RELSYSDIR)/examples
 
117
        $(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/examples
115
118
        $(INSTALL_DIR) $(RELSYSDIR)/include
116
119
        $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
117
120
        $(INSTALL_DIR) $(RELSYSDIR)/ebin