mirror of
https://github.com/transmission/transmission
synced 2024-12-25 01:03:01 +00:00
The CFLAGS/LDFLAGS passed to configure are now put at the end at the
compile line, so our default settings (esp for -O) can be overridden
This commit is contained in:
parent
dfe3bc870a
commit
2396691d0d
1 changed files with 21 additions and 17 deletions
|
@ -2,39 +2,42 @@ VERSION_MAJOR = 0
|
||||||
VERSION_MINOR = 5
|
VERSION_MINOR = 5
|
||||||
VERSION_STRING = 0.6-svn
|
VERSION_STRING = 0.6-svn
|
||||||
|
|
||||||
RM = rm -Rf
|
TMPCFLAGS = -g -Wall -W -O3 -funroll-loops -D_FILE_OFFSET_BITS=64 \
|
||||||
MOREFLAGS = -g -Wall -W -O3 -funroll-loops -D_FILE_OFFSET_BITS=64 \
|
-D_LARGEFILE_SOURCE -D_GNU_SOURCE \
|
||||||
-D_LARGEFILE_SOURCE -D_GNU_SOURCE \
|
-DVERSION_MAJOR=$(VERSION_MAJOR) \
|
||||||
-DVERSION_MAJOR=$(VERSION_MAJOR) \
|
-DVERSION_MINOR=$(VERSION_MINOR) \
|
||||||
-DVERSION_MINOR=$(VERSION_MINOR) \
|
-DVERSION_STRING=\"$(VERSION_STRING)\" \
|
||||||
-DVERSION_STRING=\"$(VERSION_STRING)\" \
|
-DSYS_$(shell echo $(SYSTEM) | tr a-z A-Z)
|
||||||
-DSYS_$(shell echo $(SYSTEM) | tr a-z A-Z)
|
TMPCXXFLAGS = $(TMPCFLAGS)
|
||||||
CFLAGS += $(MOREFLAGS)
|
TMPLDFLAGS =
|
||||||
CXXFLAGS += $(MOREFLAGS)
|
|
||||||
|
|
||||||
ifeq ($(SYSTEM),BeOS)
|
ifeq ($(SYSTEM),BeOS)
|
||||||
CXXFLAGS += -Wno-multichar
|
TMPCXXFLAGS += -Wno-multichar
|
||||||
ifeq ($(BEOS_NETSERVER),yes)
|
ifeq ($(BEOS_NETSERVER),yes)
|
||||||
CFLAGS += -DBEOS_NETSERVER
|
TMPCFLAGS += -DBEOS_NETSERVER
|
||||||
LDFLAGS += -lnet
|
TMPLDFLAGS += -lnet
|
||||||
else
|
else
|
||||||
LDFLAGS += -lbind -lsocket
|
TMPLDFLAGS += -lbind -lsocket
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(PTHREAD),yes)
|
ifeq ($(PTHREAD),yes)
|
||||||
ifeq ($(SYSTEM),FreeBSD)
|
ifeq ($(SYSTEM),FreeBSD)
|
||||||
LDFLAGS += -pthread
|
TMPLDFLAGS += -pthread
|
||||||
else
|
else
|
||||||
LDFLAGS += -lpthread
|
TMPLDFLAGS += -lpthread
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OPENSSL),yes)
|
ifeq ($(OPENSSL),yes)
|
||||||
CFLAGS += -DHAVE_OPENSSL
|
TMPCFLAGS += -DHAVE_OPENSSL
|
||||||
LDFLAGS += -lcrypto
|
TMPLDFLAGS += -lcrypto
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
CFLAGS := $(TMPCFLAGS) $(CFLAGS)
|
||||||
|
CXXFLAGS := $(TMPCXXFLAGS) $(CXXFLAGS)
|
||||||
|
LDFLAGS := $(TMPLDFLAGS) $(LDFLAGS)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Utils
|
# Utils
|
||||||
#
|
#
|
||||||
|
@ -57,4 +60,5 @@ define LINK_RULE
|
||||||
( echo "Compile line for $@ was:"; echo $$CMD; false )
|
( echo "Compile line for $@ was:"; echo $$CMD; false )
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
RM = rm -Rf
|
||||||
MAKE += --no-print-directory
|
MAKE += --no-print-directory
|
||||||
|
|
Loading…
Reference in a new issue