1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
|
From: Alessio Treglia <quadrispro@ubuntu.com>
Date: Wed, 7 Dec 2022 07:57:15 +0100
Subject: Don't compile dmalloc and don't link it against GPL-stuff.
Forwarded: yes
---
libs/pbd/Makefile.am | 1 -
libs/pbd/Makefile.in | 4 +---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/libs/pbd/Makefile.am b/libs/pbd/Makefile.am
index 171f8cc..b2ee2b5 100644
--- a/libs/pbd/Makefile.am
+++ b/libs/pbd/Makefile.am
@@ -12,7 +12,6 @@ noinst_LIBRARIES = libpbd.a
libpbd_a_SOURCES = \
basename.cc \
dirname.cc \
- dmalloc.cc \
ftw.cc \
mountpoint.cc \
pathscanner.cc \
diff --git a/libs/pbd/Makefile.in b/libs/pbd/Makefile.in
index cc83dd3..1b57443 100644
--- a/libs/pbd/Makefile.in
+++ b/libs/pbd/Makefile.in
@@ -112,7 +112,7 @@ am__v_AR_1 =
libpbd_a_AR = $(AR) $(ARFLAGS)
libpbd_a_LIBADD =
am_libpbd_a_OBJECTS = basename.$(OBJEXT) dirname.$(OBJEXT) \
- dmalloc.$(OBJEXT) ftw.$(OBJEXT) mountpoint.$(OBJEXT) \
+ ftw.$(OBJEXT) mountpoint.$(OBJEXT) \
pathscanner.$(OBJEXT) pool.$(OBJEXT) pthread_utils.$(OBJEXT) \
receiver.$(OBJEXT) textreceiver.$(OBJEXT) \
transmitter.$(OBJEXT) undo.$(OBJEXT) unescape.$(OBJEXT) \
@@ -372,7 +372,6 @@ noinst_LIBRARIES = libpbd.a
libpbd_a_SOURCES = \
basename.cc \
dirname.cc \
- dmalloc.cc \
ftw.cc \
mountpoint.cc \
pathscanner.cc \
@@ -462,7 +461,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dmalloc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftw.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountpoint.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pathscanner.Po@am__quote@ # am--include-marker
|