3438fddffd
audio/audacity: Remove bogus STATIC_WX option This was accepted by me in r495224. STATIC_WX_ENABLE was probably supposed to be STATIC_WX_CONFIGURE_ENABLE but the entire idea of the option is flawed. wxgtk31 does not provide static libraries. While here drop unhooked JACK_LIB_DEPENDS options helper. Audacity has been using the system Portaudio for a while and JACK support can be enabled there. Remove a bunch of unused *_DESC Update to upstream version 2.3.3 PR: 242169 Submitted by: xxjack12xx@gmail.com (maintainer) Approved by: ports-secteam (riggs)
53 lines
1.3 KiB
Plaintext
53 lines
1.3 KiB
Plaintext
--- lib-src/FileDialog/Makefile.am.orig 2018-10-01 14:07:33 UTC
|
|
+++ lib-src/FileDialog/Makefile.am
|
|
@@ -2,5 +2,7 @@
|
|
ACLOCAL_AMFLAGS = -I m4
|
|
|
|
+SUBDIRS= $(GTK_SUBDIR) $(MAC_SUBDIR) $(WINDOWS_SUBDIR)
|
|
+DIST_SUBDIRS= gtk mac win
|
|
lib_LTLIBRARIES = libFileDialog.la
|
|
|
|
libFileDialog_la_LIBTOOLFLAGS = --tag=CXX
|
|
@@ -11,22 +13,32 @@ libFileDialog_la_LIBADD = $(WX_LIBS)
|
|
libFileDialog_la_SOURCES = FileDialog.cpp FileDialog.h
|
|
|
|
if GTK
|
|
-libFileDialog_la_CPPFLAGS += $(GTK_CFLAGS)
|
|
-libFileDialog_la_LIBADD += $(GTK_LIBS)
|
|
+GTK_SUBDIR= gtk
|
|
+libFileDialog_la_LIBADD += \
|
|
+ gtk/libFileDialog.la \
|
|
+ $(NULL)
|
|
libFileDialog_la_SOURCES += \
|
|
- gtk/FileDialogPrivate.cpp \
|
|
gtk/FileDialogPrivate.h \
|
|
$(NULL)
|
|
endif
|
|
|
|
if MAC
|
|
-libFileDialog_la_SOURCES += mac/FileDialogPrivate.mm \
|
|
- mac/FileDialogPrivate.h \
|
|
- $(NULL)
|
|
+MAC_SUBDIR= mac
|
|
+libFileDialog_la_LIBADD+= \
|
|
+ mac/libFileDialog.la \
|
|
+ $(NULL)
|
|
+libFileDialog_la_SOURCES += \
|
|
+ mac/FileDialogPrivate.h \
|
|
+ $(NULL)
|
|
+#nodist_EXTRA_libFileDialog_la_SOURCES = dummy.mm
|
|
endif
|
|
|
|
if WINDOWS
|
|
-libFileDialog_la_SOURCES += win/FileDialogPrivate.cpp \
|
|
- win/FileDialogPrivate.h \
|
|
- $(NULL)
|
|
+WINDOWS_SUBDIR= win
|
|
+libFileDialog_la_LIBADD+= \
|
|
+ win/libFileDialog.la \
|
|
+ $(NULL)
|
|
+libFileDialog_la_SOURCES += \
|
|
+ win/FileDialogPrivate.h \
|
|
+ $(NULL)
|
|
endif
|