Mercurial > mplayer.hg
changeset 21210:39a0f240f3d7
Sync with FFmpeg r7167.
| author | diego |
|---|---|
| date | Sat, 25 Nov 2006 16:55:02 +0000 |
| parents | 03cd07c3c8de |
| children | 0cb72a86e85f |
| files | common.mak |
| diffstat | 1 files changed, 4 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/common.mak Sat Nov 25 16:49:29 2006 +0000 +++ b/common.mak Sat Nov 25 16:55:02 2006 +0000 @@ -2,8 +2,8 @@ # common bits used by all libraries # -SRC_DIR = $(SRC_PATH)/lib$(NAME) -VPATH = $(SRC_DIR) +VPATH = $(SRC_PATH_BARE)/lib$(NAME) +SRC_DIR = "$(VPATH)" CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \ @@ -45,7 +45,7 @@ clean:: rm -f *.o *.d *~ *.a *.lib *.so *.so.* *.dylib *.dll \ - *.lib *.def *.dll.a *.exp + *.def *.dll.a *.exp distclean: clean rm -f .depend @@ -78,7 +78,7 @@ install-headers: install -d "$(incdir)" install -d "$(libdir)/pkgconfig" - install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(incdir)" + install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(incdir)" install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig" uninstall: uninstall-libs uninstall-headers @@ -95,9 +95,6 @@ .PHONY: all depend dep clean distclean install* uninstall* -# -# include dependency files if they exist -# ifneq ($(wildcard .depend),) include .depend endif