diff options
| author | Rickard Green <[email protected]> | 2010-09-03 18:56:14 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2010-09-03 18:56:14 +0200 |
| commit | cac3a16a49d0ba8c4694d985b17403ac4456ade7 (patch) | |
| tree | 78fa24b13a5878c622a8b8a2117b42fb4660728a /lib/crypto/c_src/Makefile.in | |
| parent | e752dcdefda84291cf819036a600b983326dae25 (diff) | |
| parent | ab64b20d32d9f496607d7a2d545194ad8d308956 (diff) | |
| download | otp-cac3a16a49d0ba8c4694d985b17403ac4456ade7.tar.gz otp-cac3a16a49d0ba8c4694d985b17403ac4456ade7.tar.bz2 otp-cac3a16a49d0ba8c4694d985b17403ac4456ade7.zip | |
Merge branch 'rickard/valgrind-improvements/OTP-8760' into dev
* rickard/valgrind-improvements/OTP-8760:
Build opt, debug and valgrind libraries as separate libraries
Add erlang:system_info(build_type)
Fix valgrind build
Diffstat (limited to 'lib/crypto/c_src/Makefile.in')
| -rw-r--r-- | lib/crypto/c_src/Makefile.in | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in index e728db18eb..040adcfd09 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -68,13 +68,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/crypto-$(VSN) # ---------------------------------------------------- # Misc Macros # ---------------------------------------------------- -OBJS = $(OBJDIR)/crypto.o +OBJS = $(OBJDIR)/crypto$(TYPEMARKER).o NIF_MAKEFILE = $(PRIVDIR)/Makefile ifeq ($(findstring win32,$(TARGET)), win32) -NIF_LIB = $(LIBDIR)/crypto.dll +NIF_LIB = $(LIBDIR)/crypto$(TYPEMARKER).dll else -NIF_LIB = $(LIBDIR)/crypto.so +NIF_LIB = $(LIBDIR)/crypto$(TYPEMARKER).so endif ifeq ($(HOST_OS),) @@ -102,20 +102,30 @@ $(OBJDIR): $(LIBDIR): -@mkdir -p $(LIBDIR) -$(OBJDIR)/%.o: %.c +$(OBJDIR)/%$(TYPEMARKER).o: %.c $(INSTALL_DIR) $(OBJDIR) $(CC) -c -o $@ $(ALL_CFLAGS) $< -$(LIBDIR)/crypto.so: $(OBJS) +$(LIBDIR)/crypto$(TYPEMARKER).so: $(OBJS) $(INSTALL_DIR) $(LIBDIR) $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(CRYPTO_LINK_LIB) -$(LIBDIR)/crypto.dll: $(OBJS) +$(LIBDIR)/crypto$(TYPEMARKER).dll: $(OBJS) $(INSTALL_DIR) $(LIBDIR) $(LD) $(LDFLAGS) -o $@ $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(OBJS) -llibeay32 clean: - rm -f $(NIF_LIB) $(OBJS) +ifeq ($(findstring win32,$(TARGET)), win32) + rm -f $(LIBDIR)/crypto.dll + rm -f $(LIBDIR)/crypto.debug.dll +else + rm -f $(LIBDIR)/crypto.so + rm -f $(LIBDIR)/crypto.debug.so + rm -f $(LIBDIR)/crypto.valgrind.so +endif + rm -f $(OBJDIR)/crypto.o + rm -f $(OBJDIR)/crypto.debug.o + rm -f $(OBJDIR)/crypto.valgrind.o rm -f core *~ docs: |