From ff191b849557997c1b864476a295a612b2e57b93 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 8 Apr 2008 18:25:30 +0000 Subject: Merge osdep/Makefile into the top-level Makefile, thus getting rid of recursive make in the osdep/ subdirectory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26352 b3059339-0415-0410-9bf9-f77b7e298cf2 --- osdep/Makefile | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 osdep/Makefile (limited to 'osdep') diff --git a/osdep/Makefile b/osdep/Makefile deleted file mode 100644 index ea57977b62..0000000000 --- a/osdep/Makefile +++ /dev/null @@ -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 $@ $< -- cgit v1.2.3