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
58
59
60
61
62
63
64
65
|
From: Bastian Blank <waldi@debian.org>
Date: Fri, 18 Jun 2021 13:32:35 +0200
Subject: Avoid forked code in the build system
Forwarded: http://www.omniorb-support.com/pipermail/omniorb-list/2002-October/022062.html
Last-Update: 2010-08-08
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.
---
mk/beforeauto.mk.in | 9 +++------
src/tool/dir.mk | 2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
--- a/mk/beforeauto.mk.in
+++ b/mk/beforeauto.mk.in
@@ -68,7 +68,6 @@
TOOLBINDIR = $(TOP)/$(BINDIR)
endif
-OMKDEPEND = $(TOOLBINDIR)/omkdepend
OMNIORB_IDL_ONLY = $(TOOLBINDIR)/omniidl -bcxx
else
@@ -721,7 +720,7 @@
CC = @CC@
CXX = @CXX@
RANLIB = @RANLIB@
-MKDIRHIER = $(BASE_OMNI_TREE)/bin/scripts/omkdirhier
+MKDIRHIER = mkdir -p
INSTLIBFLAGS = -m 0644
INSTEXEFLAGS = -m 0755
CP = cp
@@ -729,8 +728,8 @@
CPP = @CPP@
RMDIRHIER = $(RM) -rf
-CXXMAKEDEPEND = $(OMKDEPEND) -D__cplusplus
-CMAKEDEPEND = $(OMKDEPEND)
+CXXMAKEDEPEND = @CXX@ -M -MD -MG
+CMAKEDEPEND = @CC@ -M -MD -MG
#
@@ -799,8 +798,6 @@
#
ifdef Compiler_GCC
-CMAKEDEPEND += -D__GNUC__
-CXXMAKEDEPEND += -D__GNUG__ -D__GNUC__
CXXOPTIONS = -Wall -Wno-unused -fexceptions @EXTRA_GCC_CXXFLAGS@
EgcsMajorVersion = 1
EgcsMinorVersion = 1
--- a/src/tool/dir.mk
+++ b/src/tool/dir.mk
@@ -7,7 +7,7 @@
endif
ifdef UnixPlatform
-SUBDIRS = omkdepend omniidl
+SUBDIRS = omniidl
endif
ifdef Win32Platform
|
