← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/crypto/priv/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/crypto/priv/Makefile
18
18
 
19
19
# ----------------------------------------------------
20
20
#        THIS MAKEFILE SERVES AS AN EXAMPLE OF
21
 
#        HOW TO RELINK THE CRYPTO DRIVER
 
21
#        HOW TO RELINK THE CRYPTO NIF LIBRARY
22
22
# ----------------------------------------------------
23
23
 
24
24
# ----------------------------------------------------
25
 
# Variables for linking a .so driver on unix.
 
25
# Variables for linking a .so library on unix.
26
26
# Note: These may differ between systems.
27
27
# ----------------------------------------------------
28
28
 
29
29
SO_LD = gcc
30
30
SO_LDFLAGS = -G 
31
31
SO_SSL_LIBDIR = /usr/local/lib
32
 
SO_DRIVER = $(LIBDIR)/$(DRIVER_NAME).so
 
32
SO_NIFLIB = $(LIBDIR)/$(LIB_NAME).so
33
33
 
34
34
# ----------------------------------------------------
35
 
# Variables for linking a win32 .dll driver.
 
35
# Variables for linking a win32 .dll library.
36
36
# Note: These may differ between systems.
37
37
# ----------------------------------------------------
38
38
 
42
42
DLL_LIBS = libeay32.lib MSVCRT.LIB kernel32.lib \
43
43
           advapi32.lib gdi32.lib user32.lib \
44
44
           comctl32.lib comdlg32.lib shell32.lib
45
 
DLL_DRIVER = $(LIBDIR)/$(DRIVER_NAME).dll
46
 
DLL_EXP = $(LIBDIR)/$(DRIVER_NAME).exp
47
 
DLL_LIB = $(LIBDIR)/$(DRIVER_NAME).lib
 
45
DLL_NIFLIB = $(LIBDIR)/$(LIB_NAME).dll
 
46
DLL_EXP = $(LIBDIR)/$(LIB_NAME).exp
 
47
DLL_LIB = $(LIBDIR)/$(LIB_NAME).lib
48
48
 
49
49
# ----------------------------------------------------
50
50
# Common variables
52
52
 
53
53
OBJDIR = ./
54
54
LIBDIR = ../lib
55
 
DRIVER_NAME = crypto_drv
56
 
OBJS = $(OBJDIR)/crypto_drv.o
 
55
LIB_NAME = crypto
 
56
OBJS = $(OBJDIR)/crypto.o
57
57
 
58
58
# ----------------------------------------------------
59
59
# Targets
60
60
# ----------------------------------------------------
61
61
 
62
 
$(SO_DRIVER): $(OBJS)
 
62
$(SO_NIFLIB): $(OBJS)
63
63
        $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
64
64
        -o $@ $^ -lcrypto
65
65
 
66
 
$(DLL_DRIVER): $(OBJS)
 
66
$(DLL_NIFLIB): $(OBJS)
67
67
        $(DLL_LD) $(DLL_LDFLAGS) -out:$@ -libpath:$(DLL_LIBDIR) $(OBJS) \
68
68
        $(DLL_LIBS)
69
69
 
70
 
so:     $(SO_DRIVER)
 
70
so:     $(SO_NIFLIB)
71
71
 
72
 
dll:    $(DLL_DRIVER)
 
72
dll:    $(DLL_NIFLIB)
73
73
 
74
74
clean:
75
 
        rm -f $(SO_DRIVER) $(DLL_DRIVER) 
 
75
        rm -f $(SO_NIFLIB) $(DLL_NIFLIB) 
76
76
        rm -f $(DLL_EXP) $(DLL_LIB)
77
77
        rm -f core *~
78
78