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

« back to all changes in this revision

Viewing changes to lib/edoc/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:
29
29
        edoc.erl edoc_data.erl edoc_doclet.erl edoc_extract.erl \
30
30
        edoc_layout.erl edoc_lib.erl edoc_macros.erl edoc_parser.erl \
31
31
        edoc_refs.erl edoc_report.erl edoc_run.erl edoc_scanner.erl \
32
 
        edoc_tags.erl edoc_types.erl edoc_wiki.erl otpsgml_layout.erl
 
32
        edoc_specs.erl edoc_tags.erl edoc_types.erl edoc_wiki.erl \
 
33
        otpsgml_layout.erl
33
34
 
34
35
OBJECTS=$(SOURCES:%.erl=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
35
36
 
55
56
 
56
57
$(OBJECTS): $(HRL_FILES) $(XMERL)/include/xmerl.hrl
57
58
 
 
59
docs: 
 
60
 
58
61
clean:
59
62
        rm -f $(OBJECTS) edoc_parser.erl
60
63
        rm -f core *~