From 99405ac93c43217b5c16c2a4aa1e18c7feb1d305 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 11 Apr 2008 17:45:02 +0000
Subject: [PATCH] Merge ./gui/Makefile into ./Makefile, one less instance of
 recursive make.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26398 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile     | 46 ++++++++++++++++++++++++++++++++++++++------
 gui/Makefile | 54 ----------------------------------------------------
 2 files changed, 40 insertions(+), 60 deletions(-)
 delete mode 100644 gui/Makefile

diff --git a/Makefile b/Makefile
index 70baa634b7..49f0b56a5f 100644
--- a/Makefile
+++ b/Makefile
@@ -99,6 +99,43 @@ SRCS_MPLAYER = mplayer.c \
 
 SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c
 SRCS_MPLAYER-$(DVBIN)        += libmenu/menu_dvbin.c
+SRCS_MPLAYER-$(GUI_GTK)      += gui/app.c \
+                                gui/bitmap.c \
+                                gui/cfg.c \
+                                gui/interface.c \
+                                gui/mplayer/gui_common.c \
+                                gui/mplayer/menu.c \
+                                gui/mplayer/mw.c \
+                                gui/mplayer/pb.c \
+                                gui/mplayer/play.c \
+                                gui/mplayer/sw.c \
+                                gui/mplayer/widgets.c \
+                                gui/mplayer/gtk/about.c \
+                                gui/mplayer/gtk/eq.c \
+                                gui/mplayer/gtk/fs.c \
+                                gui/mplayer/gtk/gtk_common.c \
+                                gui/mplayer/gtk/gtk_url.c \
+                                gui/mplayer/gtk/mb.c \
+                                gui/mplayer/gtk/menu.c \
+                                gui/mplayer/gtk/opts.c \
+                                gui/mplayer/gtk/pl.c \
+                                gui/mplayer/gtk/sb.c \
+                                gui/skin/cut.c \
+                                gui/skin/font.c \
+                                gui/skin/skin.c \
+                                gui/wm/ws.c \
+                                gui/wm/wsxdnd.c \
+
+SRCS_MPLAYER-$(GUI_WIN32)    += gui/bitmap.c \
+                                gui/win32/dialogs.c \
+                                gui/win32/gui.c \
+                                gui/win32/interface.c \
+                                gui/win32/playlist.c \
+                                gui/win32/preferences.c \
+                                gui/win32/skinload.c \
+                                gui/win32/widgetrender.c \
+                                gui/win32/wincfg.c \
+
 SRCS_MPLAYER-$(JOYSTICK)     += input/joystick.c
 SRCS_MPLAYER-$(LIBMENU)      += libmenu/menu.c \
                                 libmenu/menu_chapsel.c \
@@ -142,7 +179,6 @@ LIBS_MPLAYER = libvo/libvo.a \
                libao2/libao2.a \
 
 LIBS_MPLAYER-$(VIDIX)             += vidix/libvidix.a
-LIBS_MPLAYER-$(GUI)               += gui/libgui.a
 
 LIBS_MENCODER = libmpcodecs/libmpencoders.a \
                 libmpdemux/libmpmux.a \
@@ -164,7 +200,6 @@ INSTALL_TARGETS-$(GUI)      += install-gui
 INSTALL_TARGETS             += $(INSTALL_TARGETS-yes)
 
 PARTS = dvdread \
-        gui \
         liba52 \
         libao2 \
         libavcodec \
@@ -262,9 +297,6 @@ tremor/libvorbisidec.a:
 vidix/libvidix.a:
 	$(MAKE) -C vidix
 
-gui/libgui.a:
-	$(MAKE) -C gui
-
 mplayer$(EXESUF): $(MPLAYER_DEPS)
 	$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
 
@@ -348,6 +380,9 @@ clean::
 	-rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \
 	  codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \
 	  codecs.conf.h help_mp.h version.h TAGS tags
+	rm -f gui/mplayer/*.o gui/mplayer/*~ gui/mplayer/gtk/*.o \
+          gui/mplayer/gtk/*~ gui/skin/*.o gui/skin/*~ \
+          gui/wm/*.o gui/wm/*~ gui/win32/*.o gui/win32/*~
 	for part in $(PARTS); do $(MAKE) -C $$part clean; done
 	for dir in $(DIRS); do rm -f $$dir/*.o $$dir/*.a $$dir/*.ho $$dir/*~ ; done
 
@@ -446,6 +481,5 @@ libfaad2/libfaad2.a: .norecurse $(wildcard libfaad2/*.[ch] libfaad2/*/*.[ch])
 
 loader/libloader.a: .norecurse $(wildcard loader/*.[chSs])
 vidix/libvidix.a: .norecurse $(wildcard vidix/*.[ch])
-gui/libgui.a: .norecurse $(wildcard gui/*.[ch] gui/*/*.[ch] gui/*/*/*.[ch])
 
 .PHONY: all install* uninstall strip doxygen doxygen_clean TAGS tags
diff --git a/gui/Makefile b/gui/Makefile
deleted file mode 100644
index 35f7a6258e..0000000000
--- a/gui/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-include ../config.mak
-
-LIBNAME_MPLAYER = libgui.a
-
-#CFLAGS += -DDEBUG
-
-ifeq ($(GUI_WIN32),yes)
-SRCS_MPLAYER = bitmap.c \
-               win32/dialogs.c \
-               win32/gui.c \
-               win32/interface.c \
-               win32/playlist.c \
-               win32/preferences.c \
-               win32/skinload.c \
-               win32/widgetrender.c \
-               win32/wincfg.c \
-
-else
-SRCS_MPLAYER = app.c \
-               bitmap.c \
-               cfg.c \
-               interface.c \
-               mplayer/gui_common.c \
-               mplayer/menu.c \
-               mplayer/mw.c \
-               mplayer/pb.c \
-               mplayer/play.c \
-               mplayer/sw.c \
-               mplayer/widgets.c \
-               mplayer/gtk/about.c \
-               mplayer/gtk/eq.c \
-               mplayer/gtk/fs.c \
-               mplayer/gtk/gtk_common.c \
-               mplayer/gtk/gtk_url.c \
-               mplayer/gtk/mb.c \
-               mplayer/gtk/menu.c \
-               mplayer/gtk/opts.c \
-               mplayer/gtk/pl.c \
-               mplayer/gtk/sb.c \
-               skin/cut.c \
-               skin/font.c \
-               skin/skin.c \
-               wm/ws.c \
-               wm/wsxdnd.c \
-
-endif
-
-include ../mpcommon.mak
-
-clean::
-	rm -f mplayer/*.o mplayer/*~ mplayer/gtk/*.o mplayer/gtk/*~ \
-              skin/*.o skin/*~ \
-              wm/*.o wm/*~ \
-              win32/*.o win32/*~ \