Reimar Döffinger
14 years ago
3 changed files with 4 additions and 7 deletions
Unified View
Diff Options
-
+1 -1Makefile
-
+0 -6common.mak
-
+3 -0configure
+ 1
- 1
Makefile
View File
| @@ -1,3 +1,4 @@ | |||||
| MAIN_MAKEFILE=1 | |||||
| include config.mak | include config.mak | ||||
| vpath %.c $(SRC_PATH) | vpath %.c $(SRC_PATH) | ||||
| @@ -39,7 +40,6 @@ DATA_FILES := $(wildcard $(SRC_PATH)/ffpresets/*.ffpreset) | |||||
| SKIPHEADERS = cmdutils_common_opts.h | SKIPHEADERS = cmdutils_common_opts.h | ||||
| MAIN_MAKEFILE=1 | |||||
| include $(SRC_PATH)/common.mak | include $(SRC_PATH)/common.mak | ||||
| FF_LDFLAGS := $(FFLDFLAGS) | FF_LDFLAGS := $(FFLDFLAGS) | ||||
+ 0
- 6
common.mak
View File
| @@ -7,12 +7,6 @@ all: all-yes | |||||
| ifndef SUBDIR | ifndef SUBDIR | ||||
| ifndef MAIN_MAKEFILE | |||||
| ifeq ($(SRC_PATH),.) | |||||
| SRC_PATH = .. | |||||
| endif | |||||
| endif | |||||
| ifndef V | ifndef V | ||||
| Q = @ | Q = @ | ||||
| ECHO = printf "$(1)\t%s\n" $(2) | ECHO = printf "$(1)\t%s\n" $(2) | ||||
+ 3
- 0
configure
View File
| @@ -3297,6 +3297,9 @@ BINDIR=\$(DESTDIR)$bindir | |||||
| DATADIR=\$(DESTDIR)$datadir | DATADIR=\$(DESTDIR)$datadir | ||||
| MANDIR=\$(DESTDIR)$mandir | MANDIR=\$(DESTDIR)$mandir | ||||
| SRC_PATH=$source_path | SRC_PATH=$source_path | ||||
| ifndef MAIN_MAKEFILE | |||||
| SRC_PATH:=\$(SRC_PATH:.%=..%) | |||||
| endif | |||||
| CC_IDENT=$cc_ident | CC_IDENT=$cc_ident | ||||
| ARCH=$arch | ARCH=$arch | ||||
| CC=$cc | CC=$cc | ||||