diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-08 18:25:30 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-08 18:25:30 +0000 |
| commit | ff191b849557997c1b864476a295a612b2e57b93 (patch) | |
| tree | e257e01f40ff49ed7cfb4411d731abdab143d2b3 /osdep | |
| parent | 2abdcd86d9ed98b44cd4531120162c1b099a8008 (diff) | |
| download | mpv-ff191b849557997c1b864476a295a612b2e57b93.tar.bz2 mpv-ff191b849557997c1b864476a295a612b2e57b93.tar.xz | |
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
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/Makefile | 23 |
1 files changed, 0 insertions, 23 deletions
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 $@ $< |