CC = @CC@
SYSTEM = @SYSTEM@
SOCKETENGINE = @SOCKETENGINE@
-NICEFLAGS = -pipe -fPIC
+CXXFLAGS = -pipe -fPIC -DPIC
LDLIBS = -pthread -lstdc++
+LDFLAGS =
SHARED = -shared -rdynamic
-CORE_FLAGS = -rdynamic -L.
-PICLDFLAGS = -fPIC -DPIC -shared -rdynamic
+CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
+PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS)
BASE = "@BASE_DIR@"
CONPATH = "@CONFIG_DIR@"
MODPATH = "@MODULE_DIR@"
INSTMODE = 0755
@IFEQ $(CC) icc
- NICEFLAGS += -Wshadow
- FLAGS = $(NICEFLAGS)
+ CXXFLAGS += -Wshadow
@ELSE
- NICEFLAGS += -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
- FLAGS = $(NICEFLAGS) -pedantic
+ CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
@ENDIF
@ELSIFEQ $(SYSTEM) sunos
LDLIBS += -lsocket -lnsl -lrt -lresolv
@ELSIFEQ $(SYSTEM) darwin
- NICEFLAGS += -DDARWIN -frtti
+ CXXFLAGS += -DDARWIN -frtti
LDLIBS += -ldl
SHARED = -bundle -twolevel_namespace -undefined dynamic_lookup
CORE_FLAGS = -dynamic -bind_at_load -L.
@ENDIF
@IFDEF D
- NICEFLAGS += -g3
+ CXXFLAGS += -g3
HEADER = debug-header
@ELSE
- NICEFLAGS += -g1
+ CXXFLAGS += -g1
HEADER = std-header
@ENDIF
FOOTER = finishmessage
-NICEFLAGS += -I$(COMPILE_ROOT)/include
+CXXFLAGS += -I$(COMPILE_ROOT)/include
@GNU_ONLY MAKEFLAGS += --no-print-directory
RUNCC = $(COMPILE_ROOT)/make/run-cc.pl $(CC)
@ENDIF
-@DO_EXPORT RUNCC FLAGS NICEFLAGS CC LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORE_FLAGS
+@DO_EXPORT RUNCC CXXFLAGS CC LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
@DO_EXPORT BASE CONPATH MODPATH BINPATH LIBPATH
# Default target
my $ofiles = join ' ', grep s#(.*)\.cpp$#$path$base/$1.o#, readdir DIR;
closedir DIR;
open OUT, '>', $cmd;
- print OUT "$out: $ofiles\n\t".'$(RUNCC) $(FLAGS) $(PICLDFLAGS) -o $@ '
+ print OUT "$out: $ofiles\n\t".'$(RUNCC) $(PICLDFLAGS) -o $@ '
.$ofiles."\n";
print OUT "$cmd: $file\n\t".'@../make/calcdep.pl '."$path$base\n";
} else {
my $out = shift;
-my $cflags = nopedantic($file) ? $ENV{NICEFLAGS} : $ENV{FLAGS};
+my $cflags = $ENV{CXXFLAGS};
+$cflags =~ s/ -pedantic// if nopedantic($file);
$cflags .= ' ' . getcompilerflags($file);
my $flags;