← Back to branch summary

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

« back to all changes in this revision

Viewing changes to erts/epmd/src/Makefile.in

  • 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:
erts/epmd/src/Makefile.in
1
1
#
2
2
# %CopyrightBegin%
3
3
# 
4
 
# Copyright Ericsson AB 1998-2009. All Rights Reserved.
 
4
# Copyright Ericsson AB 1998-2010. 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
49
49
 
50
50
BINDIR  = $(ERL_TOP)/bin/$(TARGET)
51
51
OBJDIR  = $(ERL_TOP)/erts/obj$(TYPEMARKER)/$(TARGET)
 
52
ERTS_INCL = -I$(ERL_TOP)/erts/include \
 
53
            -I$(ERL_TOP)/erts/include/$(TARGET) \
 
54
            -I$(ERL_TOP)/erts/include/internal \
 
55
            -I$(ERL_TOP)/erts/include/internal/$(TARGET)
 
56
 
 
57
# On windows we always need reentrant libraries.
 
58
ifeq ($(TARGET),win32)
 
59
ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal_r$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@
 
60
else
 
61
ifeq ($(findstring vxworks,$(TARGET)),vxworks)
 
62
ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@
 
63
else
 
64
ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ -lm
 
65
endif
 
66
endif
52
67
 
53
68
CC      = @CC@
54
69
WFLAGS  = @WFLAGS@
55
 
CFLAGS  = @CFLAGS@ @DEFS@ $(TYPE_FLAGS) $(WFLAGS)
 
70
CFLAGS  = @CFLAGS@ @DEFS@ $(TYPE_FLAGS) $(WFLAGS) $(ERTS_INCL)
56
71
LD      = @LD@
57
 
LIBS    = @LIBS@
 
72
LIBS    = @LIBS@ $(ERTS_INTERNAL_LIBS)
58
73
LDFLAGS = @LDFLAGS@
59
74
 
60
75
 
 
76
 
61
77
# ----------------------------------------------------
62
78
# Release directory specification
63
79
# ----------------------------------------------------
90
106
#---------------------------------
91
107
 
92
108
 
93
 
all: $(BINDIR)/$(EPMD)
 
109
all: erts_lib $(BINDIR)/$(EPMD)
94
110
 
95
111
docs:
96
112
 
109
125
$(BINDIR)/$(EPMD): $(EPMD_OBJS)
110
126
        $(PURIFY) $(LD) $(LDFLAGS) -o $@ $(EPMD_OBJS) $(LIBS)
111
127
 
112
 
$(OBJDIR)/%.o: %.c
 
128
$(OBJDIR)/%.o: %.c epmd.h epmd_int.h
113
129
        $(CC) $(CFLAGS) $(EPMD_FLAGS) -o $@ -c $<
114
130
 
 
131
erts_lib:
 
132
        cd $(ERL_TOP)/erts/lib_src && $(MAKE) $(TYPE)
 
133
 
115
134
include $(ERL_TOP)/make/otp_release_targets.mk
116
135
 
117
136
release_spec: all