]> git.sesse.net Git - vlc/blobdiff - share/Makefile.am
update osx defaults
[vlc] / share / Makefile.am
index d7b5dbdecc7ad0477cb7cb0391d304febbb43e99..96d4748a4d6c98861c680bbe846e83da853da043 100644 (file)
@@ -1,17 +1,30 @@
 CLEANFILES = skins2/default.vlt
 MOSTLYCLEANFILES =
+EXTRA_DIST =
 
-appdatadir = $(datadir)/applications/
+appdatadir = $(datadir)/applications
+if !HAVE_WIN32
+if !HAVE_WINCE
+appdata_DATA = vlc.desktop
+endif
+endif
+EXTRA_DIST += vlc.desktop.in
+CLEANFILES += $(appdata_DATA)
 
-iconsdatadir = $(datadir)/icons/hicolor/
-icons16dir = $(iconsdatadir)/16x16/apps/
-icons32dir = $(iconsdatadir)/32x32/apps/
-icons48dir = $(iconsdatadir)/48x48/apps/
-icons128dir = $(iconsdatadir)/128x128/apps/
-icons256dir = $(iconsdatadir)/256x256/apps/
+vlc.desktop: vlc.desktop.in $(top_builddir)/config.status
+       $(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < "$<" > tmp-$@
+       $(AM_V_at)$(DESKTOP_FILE_VALIDATE) tmp-$@
+       $(AM_V_at)mv -f tmp-$@ $@
 
-dist_appdata_DATA = vlc.desktop
+iconsdatadir = $(datadir)/icons/hicolor
+icons16dir = $(iconsdatadir)/16x16/apps
+icons32dir = $(iconsdatadir)/32x32/apps
+icons48dir = $(iconsdatadir)/48x48/apps
+icons128dir = $(iconsdatadir)/128x128/apps
+icons256dir = $(iconsdatadir)/256x256/apps
 
+if !HAVE_WIN32
+if !HAVE_WINCE
 dist_vlcdata_DATA = icons/vlc.ico
 dist_icons16_DATA = icons/16x16/vlc.png icons/16x16/vlc.xpm
 dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm \
@@ -25,8 +38,10 @@ nobase_dist_vlcdata_SCRIPTS = \
        utils/audio-vlc-default.sh \
        utils/video-vlc-default.sh \
        $(NULL)
+endif
+endif
 
-EXTRA_DIST = \
+EXTRA_DIST += \
        $(skins2_default_vlt_FILES) \
        $(DIST_rsrc) \
        $(DIST_skins2) \
@@ -149,6 +164,7 @@ nobase_vlclib_DATA = \
        lua/meta/art/01_googleimage.luac \
        lua/meta/fetcher/tvrage.luac \
        lua/meta/reader/filename.luac \
+       lua/modules/dkjson.luac \
        lua/modules/sandbox.luac \
        lua/modules/simplexml.luac \
        lua/playlist/anevia_streams.luac \
@@ -215,6 +231,7 @@ EXTRA_DIST += \
        lua/meta/fetcher/tvrage.lua \
        lua/meta/reader/README.txt \
        lua/meta/reader/filename.lua \
+       lua/modules/dkjson.lua \
        lua/modules/sandbox.lua \
        lua/modules/simplexml.lua \
        lua/playlist/README.txt \
@@ -323,9 +340,11 @@ DIST_http_lua = \
        lua/http/mobile_view.html \
        lua/http/.hosts \
        lua/http/requests/playlist.xml \
+       lua/http/requests/playlist.json \
        lua/http/requests/README.txt \
        lua/http/requests/playlist_jstree.xml \
        lua/http/requests/browse.xml \
+       lua/http/requests/browse.json \
        lua/http/requests/vlm_cmd.xml \
        lua/http/requests/status.xml \
        lua/http/requests/status.json \