[MPlayer-cvslog] r26817 - in trunk: Makefile configure

[diego]

Author: diego
Date: Sun May 18 18:25:20 2008
New Revision: 26817

Log:
Introduce make variable common to the GTK and Windows GUI and use it
in the appropriate places.


Modified:
   trunk/Makefile
   trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Sun May 18 18:25:20 2008
@@ -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.
                                 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 =  . \

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sun May 18 18:25:20 2008
@@ -7739,6 +7739,7 @@ TARGET_CPU=$iproc
 `echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/'`
 
 # --- GUI stuff ---
+GUI = $_gui
 GUI_GTK = $_gui_gtk
 GUI_WIN32 = $_gui_win32