1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
|
Description: Avoid forked code in the build system
This replaces omkdirhier and omkdepend which are source-level copies
of other projects. They are only used during the build system and
can be easily replicated using standard OS and compiler programs in
Debian.
.
Upstream discussion:
http://www.omniorb-support.com/pipermail/omniorb-list/2002-October/022062.html
Forwarded: not-needed
Author: Bastian Blank <waldi@debian.org>
Last-Update: 2010-08-09
--- a/mk/beforeauto.mk.in
+++ b/mk/beforeauto.mk.in
@@ -662,17 +662,16 @@
CC = @CC@
CXX = @CXX@
RANLIB = @RANLIB@
-MKDIRHIER = @MKDIRHIER@
+MKDIRHIER = mkdir -p
INSTLIBFLAGS = -m 0644
INSTEXEFLAGS = -m 0755
CP = cp
MV = mv -f
CPP = @CPP@
-OMKDEPEND = @OMKDEPEND@
RMDIRHIER = $(RM) -rf
-CXXMAKEDEPEND = $(OMKDEPEND) -D__cplusplus
-CMAKEDEPEND = $(OMKDEPEND)
+CXXMAKEDEPEND = @CXX@ -M -MD -MG
+CMAKEDEPEND = @CC@ -M -MD -MG
#
@@ -710,10 +709,10 @@
#
# Default compiler rules
#
-CDEBUGFLAGS = -O
+CDEBUGFLAGS = -g
CLINK = $(CC)
CLINKOPTIONS = $(CDEBUGFLAGS) $(COPTIONS)
-CXXDEBUGFLAGS = -O2
+CXXDEBUGFLAGS = -g
CXXLINK = $(CXX)
CXXLINKOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS)
@@ -724,8 +723,6 @@
#
ifdef Compiler_GCC
-CMAKEDEPEND += -D__GNUC__
-CXXMAKEDEPEND += -D__GNUG__ -D__GNUC__
CXXOPTIONS = -Wall -Wno-unused -fexceptions
EgcsMajorVersion = 1
EgcsMinorVersion = 1
|