[vlc-commits] macosx: Simplify XIB build definition

[Marvin Scholz]

vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Sun Aug  5 03:21:42 2018 +0200| [09f8142c6e458c9ee709f1eddb41de997b390ef2] | committer: Marvin Scholz

macosx: Simplify XIB build definition

Now the .xib files are properly defined as sources, and not as it was
before where the .nib files were sources for some reason.
Additionally only one list is required now, which simplifies things.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=09f8142c6e458c9ee709f1eddb41de997b390ef2
---

 modules/gui/macosx/Makefile.am | 59 ++++++++++++------------------------------
 1 file changed, 16 insertions(+), 43 deletions(-)

diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 9c18c36013..abde2906d4 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -1,4 +1,16 @@
-SUFFIXES += .xib
+SUFFIXES += .xib .nib
+
+xib_verbose = $(xib_verbose_$(V))
+xib_verbose_ = $(xib_verbose__$(AM_DEFAULT_VERBOSITY))
+xib_verbose_0 = @echo "  XIB     " $@;
+xib_verbose__0 = $(xib_verbose_0)
+
+.xib.nib:
+	$(AM_V_at)mkdir -p -- gui/macosx/UI
+	$(xib_verbose)$(XIB) --errors --warnings --notices \
+	  --module VLC --auto-activate-custom-fonts --target-device mac \
+	  --minimum-deployment-target 10.10 --output-format human-readable-text \
+	  --compile $@ $<
 
 libmacosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-exceptions -fobjc-arc
 libmacosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' \
@@ -101,36 +113,7 @@ libmacosx_plugin_la_SOURCES = \
 
 # User interface compilation
 
-nodist_libmacosx_plugin_la_SOURCES = \
-	gui/macosx/UI/About.nib \
-	gui/macosx/UI/AddonManager.nib \
-	gui/macosx/UI/AudioEffects.nib \
-	gui/macosx/UI/Bookmarks.nib \
-	gui/macosx/UI/ConvertAndSave.nib \
-	gui/macosx/UI/CoreDialogs.nib \
-	gui/macosx/UI/DetachedVideoWindow.nib \
-	gui/macosx/UI/ErrorPanel.nib \
-	gui/macosx/UI/Help.nib \
-	gui/macosx/UI/LogMessageWindow.nib \
-	gui/macosx/UI/MainMenu.nib \
-	gui/macosx/UI/MainWindow.nib \
-	gui/macosx/UI/MediaInfo.nib \
-	gui/macosx/UI/Open.nib \
-	gui/macosx/UI/PlaylistAccessoryView.nib \
-	gui/macosx/UI/PlaylistMenu.nib \
-	gui/macosx/UI/PopupPanel.nib \
-	gui/macosx/UI/Preferences.nib \
-	gui/macosx/UI/ResumeDialog.nib \
-	gui/macosx/UI/SimplePreferences.nib \
-	gui/macosx/UI/StreamOutput.nib \
-	gui/macosx/UI/SyncTracks.nib \
-	gui/macosx/UI/TextfieldPanel.nib \
-	gui/macosx/UI/TimeSelectionPanel.nib \
-	gui/macosx/UI/VideoEffects.nib \
-	gui/macosx/UI/VLCFullScreenPanel.nib \
-	gui/macosx/UI/VLCStatusBarIconMainMenu.nib
-
-EXTRA_DIST += \
+libmacosx_plugin_la_XIB_SOURCES = \
 	gui/macosx/UI/About.xib \
 	gui/macosx/UI/AddonManager.xib \
 	gui/macosx/UI/AudioEffects.xib \
@@ -159,21 +142,11 @@ EXTRA_DIST += \
 	gui/macosx/UI/VLCFullScreenPanel.xib \
 	gui/macosx/UI/VLCStatusBarIconMainMenu.xib
 
-xib_verbose = $(xib_verbose_$(V))
-xib_verbose_ = $(xib_verbose__$(AM_DEFAULT_VERBOSITY))
-xib_verbose_0 = @echo "  XIB   " $@;
-xib_verbose__0 = $(xib_verbose_0)
-
-.xib.nib:
-	$(AM_V_at)mkdir -p -- gui/macosx/UI
-	$(xib_verbose)$(XIB) --errors --warnings --notices \
-	  --module VLC --auto-activate-custom-fonts --target-device mac \
-	  --minimum-deployment-target 10.10 --output-format human-readable-text \
-	  --compile $@ $<
+libmacosx_plugin_la_SOURCES += $(libmacosx_plugin_la_XIB_SOURCES)
 
 if ENABLE_MACOSX_UI
 gui_LTLIBRARIES += libmacosx_plugin.la
-BUILT_SOURCES += $(nodist_libmacosx_plugin_la_SOURCES)
+BUILT_SOURCES += $(libmacosx_plugin_la_XIB_SOURCES:.xib=.nib)
 endif