Changeset 231


Ignore:
Timestamp:
Apr 12, 2006, 10:09:54 PM (16 years ago)
Author:
titer
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.common

    r198 r231  
    33VERSION_STRING = 0.6-svn
    44
    5 RM        = rm -Rf
    6 MOREFLAGS = -g -Wall -W -O3 -funroll-loops -D_FILE_OFFSET_BITS=64 \
    7             -D_LARGEFILE_SOURCE -D_GNU_SOURCE \
    8             -DVERSION_MAJOR=$(VERSION_MAJOR) \
    9             -DVERSION_MINOR=$(VERSION_MINOR) \
    10             -DVERSION_STRING=\"$(VERSION_STRING)\" \
    11             -DSYS_$(shell echo $(SYSTEM) | tr a-z A-Z)
    12 CFLAGS   += $(MOREFLAGS)
    13 CXXFLAGS += $(MOREFLAGS)
     5TMPCFLAGS   = -g -Wall -W -O3 -funroll-loops -D_FILE_OFFSET_BITS=64 \
     6              -D_LARGEFILE_SOURCE -D_GNU_SOURCE \
     7              -DVERSION_MAJOR=$(VERSION_MAJOR) \
     8              -DVERSION_MINOR=$(VERSION_MINOR) \
     9              -DVERSION_STRING=\"$(VERSION_STRING)\" \
     10              -DSYS_$(shell echo $(SYSTEM) | tr a-z A-Z)
     11TMPCXXFLAGS = $(TMPCFLAGS)
     12TMPLDFLAGS  =
    1413
    1514ifeq ($(SYSTEM),BeOS)
    16 CXXFLAGS += -Wno-multichar
     15TMPCXXFLAGS += -Wno-multichar
    1716ifeq ($(BEOS_NETSERVER),yes)
    18 CFLAGS  += -DBEOS_NETSERVER
    19 LDFLAGS += -lnet
     17TMPCFLAGS  += -DBEOS_NETSERVER
     18TMPLDFLAGS += -lnet
    2019else
    21 LDFLAGS += -lbind -lsocket
     20TMPLDFLAGS += -lbind -lsocket
    2221endif
    2322endif
     
    2524ifeq ($(PTHREAD),yes)
    2625ifeq ($(SYSTEM),FreeBSD)
    27 LDFLAGS += -pthread
     26TMPLDFLAGS += -pthread
    2827else
    29 LDFLAGS += -lpthread
     28TMPLDFLAGS += -lpthread
    3029endif
    3130endif
    3231
    3332ifeq ($(OPENSSL),yes)
    34 CFLAGS  += -DHAVE_OPENSSL
    35 LDFLAGS += -lcrypto
     33TMPCFLAGS  += -DHAVE_OPENSSL
     34TMPLDFLAGS += -lcrypto
    3635endif
     36
     37CFLAGS   := $(TMPCFLAGS) $(CFLAGS)
     38CXXFLAGS := $(TMPCXXFLAGS) $(CXXFLAGS)
     39LDFLAGS  := $(TMPLDFLAGS) $(LDFLAGS)
    3740
    3841#
     
    5861endef
    5962
     63RM    = rm -Rf
    6064MAKE += --no-print-directory
Note: See TracChangeset for help on using the changeset viewer.