summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-18 16:25:20 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-18 16:25:20 +0000
commit049d820592abd5ac25d0fa8167ee49df3c28f8a6 (patch)
treee38890fe9081b1c5a912771e07f6d4c9aecab4aa /Makefile
parent63b29dabbcba96c861556e3563f2cadac43c94b5 (diff)
downloadmpv-049d820592abd5ac25d0fa8167ee49df3c28f8a6.tar.bz2
mpv-049d820592abd5ac25d0fa8167ee49df3c28f8a6.tar.xz
Introduce make variable common to the GTK and Windows GUI and use it
in the appropriate places. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26817 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index d9209880f1..b26d784e43 100644
--- a/Makefile
+++ b/Makefile
@@ -511,8 +511,8 @@ SRCS_MPLAYER = mplayer.c \
SRCS_MPLAYER-$(APPLE_IR) += input/appleir.c
SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c
+SRCS_MPLAYER-$(GUI) += gui/bitmap.c
SRCS_MPLAYER-$(GUI_GTK) += gui/app.c \
- gui/bitmap.c \
gui/cfg.c \
gui/interface.c \
gui/mplayer/gui_common.c \
@@ -538,8 +538,7 @@ SRCS_MPLAYER-$(GUI_GTK) += gui/app.c \
gui/wm/ws.c \
gui/wm/wsxdnd.c \
-SRCS_MPLAYER-$(GUI_WIN32) += gui/bitmap.c \
- gui/win32/dialogs.c \
+SRCS_MPLAYER-$(GUI_WIN32) += gui/win32/dialogs.c \
gui/win32/gui.c \
gui/win32/interface.c \
gui/win32/playlist.c \
@@ -639,7 +638,7 @@ ALL_PRG += $(ALL_PRG-yes)
INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man
INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mencoder-man
-INSTALL_TARGETS-$(GUI_GTK) += install-gui
+INSTALL_TARGETS-$(GUI) += install-gui
INSTALL_TARGETS += $(INSTALL_TARGETS-yes)
DIRS = . \