diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-25 16:55:02 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-25 16:55:02 +0000 |
| commit | d55ba3f04632ca2be66ed06612e66baf7201fbe0 (patch) | |
| tree | 88bf9f44039f8b168608e7f27434e4b5d5ca766a /common.mak | |
| parent | e2d12a60b440cedcc22bab1cba082eadeee5633d (diff) | |
| download | mpv-d55ba3f04632ca2be66ed06612e66baf7201fbe0.tar.bz2 mpv-d55ba3f04632ca2be66ed06612e66baf7201fbe0.tar.xz | |
Sync with FFmpeg r7167.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21226 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/common.mak b/common.mak index d045c0895d..d4a8dca416 100644 --- a/common.mak +++ b/common.mak @@ -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 @@ depend dep: $(SRCS) 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-lib-static: $(LIB) 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 @@ uninstall-headers: .PHONY: all depend dep clean distclean install* uninstall* -# -# include dependency files if they exist -# ifneq ($(wildcard .depend),) include .depend endif |