changeset 26320:c0dba62cd135

Merge osdep/Makefile into the top-level Makefile, thus getting rid of recursive make in the osdep/ subdirectory.

--- a/Makefile	Tue Apr 08 18:03:14 2008 +0000
+++ b/Makefile	Tue Apr 08 18:25:30 2008 +0000
@@ -33,7 +33,18 @@
               subopt-helper.c \
               subreader.c \
               vobsub.c \
+              osdep/$(GETCH) \
+              osdep/$(TIMER) \
 
+SRCS_COMMON-$(HAVE_SYS_MMAN_H)       += osdep/mmap_anon.c
+SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c
+SRCS_COMMON-$(NEED_GETTIMEOFDAY)     += osdep/gettimeofday.c
+SRCS_COMMON-$(NEED_GLOB)             += osdep/glob-win.c
+SRCS_COMMON-$(NEED_SETENV)           += osdep/setenv.c
+SRCS_COMMON-$(NEED_SHMEM)            += osdep/shmem.c
+SRCS_COMMON-$(NEED_STRSEP)           += osdep/strsep.c
+SRCS_COMMON-$(NEED_SWAB)             += osdep/swab.c
+SRCS_COMMON-$(NEED_VSSCANF)          += osdep/vsscanf.c
 SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c
 
 SRCS_MPLAYER = mplayer.c \
@@ -96,9 +107,6 @@
 LIBS_MENCODER = libmpcodecs/libmpencoders.a \
                 libmpdemux/libmpmux.a \
 
-# Having this in libosdep.a is not enough.
-OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
-
 ALL_PRG-$(MPLAYER)  += mplayer$(EXESUF)
 ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
 
@@ -107,8 +115,6 @@
 OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
 ALL_PRG      += $(ALL_PRG-yes)
 
-COMMON_LIBS += osdep/libosdep.a
-
 MPLAYER_DEPS  = $(OBJS_MPLAYER)  $(OBJS_COMMON) $(LIBS_MPLAYER)  $(COMMON_LIBS)
 MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS)
 
@@ -136,13 +142,13 @@
         libvo \
         loader \
         mp3lib \
-        osdep \
         stream \
         tremor \
         vidix \
 
 DIRS =  input \
         libmenu \
+        osdep \
 
 all:	$(ALL_PRG)
 
@@ -225,12 +231,6 @@
 gui/libgui.a:
 	$(MAKE) -C gui
 
-osdep/libosdep.a:
-	$(MAKE) -C osdep
-
-osdep/mplayer-rc.o: version.h
-	$(MAKE) -C osdep mplayer-rc.o
-
 mplayer$(EXESUF): $(MPLAYER_DEPS)
 	$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
 
@@ -251,6 +251,9 @@
 codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o
 	$(CC) -I. -DTESTING codec-cfg.c mp_msg.o osdep/getch2.o -ltermcap -o $@
 
+osdep/mplayer-rc.o: osdep/mplayer.rc version.h
+	$(WINDRES) -o $@ $<
+
 install: install-dirs $(INSTALL_TARGETS)
 
 install-dirs:
@@ -389,7 +392,6 @@
 libvo/libvo.a: .norecurse $(wildcard libvo/*.[ch])
 libvo/libosd.a: .norecurse $(wildcard libvo/*.[ch])
 libao2/libao2.a: .norecurse $(wildcard libao2/*.[ch])
-osdep/libosdep.a: .norecurse $(wildcard osdep/*.[ch])
 
 libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch])
 dvdread/libdvdread.a: .norecurse $(wildcard dvdread/*.[ch])

--- a/osdep/Makefile	Tue Apr 08 18:03:14 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-include ../config.mak
-
-LIBNAME_COMMON = libosdep.a
-
-SRCS_COMMON                          += $(GETCH)
-SRCS_COMMON                          += $(TIMER)
-
-SRCS_COMMON-$(HAVE_SYS_MMAN_H)       += mmap_anon.c
-SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += macosx_finder_args.c
-
-SRCS_COMMON-$(NEED_GETTIMEOFDAY)     += gettimeofday.c
-SRCS_COMMON-$(NEED_GLOB)             += glob-win.c
-SRCS_COMMON-$(NEED_MMAP)             += mmap-os2.c
-SRCS_COMMON-$(NEED_SETENV)           += setenv.c
-SRCS_COMMON-$(NEED_SHMEM)            += shmem.c
-SRCS_COMMON-$(NEED_STRSEP)           += strsep.c
-SRCS_COMMON-$(NEED_SWAB)             += swab.c
-SRCS_COMMON-$(NEED_VSSCANF)          += vsscanf.c
-
-include ../mpcommon.mak
-
-mplayer-rc.o: mplayer.rc
-	$(WINDRES) -o $@ $<