summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-17 03:41:50 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-17 03:41:50 +0000
commitad30fb69feb08fac758ad7c2d12d3a5008fbed7c (patch)
treea6fb433411de3647a38306988be14a0c25b3e221 /TAO
parentb073a1053f47498ff14275d661e7bc17e56a5e56 (diff)
downloadATCD-ad30fb69feb08fac758ad7c2d12d3a5008fbed7c.tar.gz
*** empty log message ***
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog-99c3
-rw-r--r--TAO/rules.tao.GNU4
2 files changed, 4 insertions, 3 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 642bdc112e8..c3085843ef4 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,5 +1,8 @@
Sun May 16 21:07:34 1999 Nanbor Wang <nanbor@cs.wustl.edu>
+ * rules.tao.GNU: Merged the stub and skeleton rules for flick
+ compiler together.
+
* TAO_IDL/Makefile:
* TAO_IDL/fe/Makefile.am: lex.yy.cpp needs to be patched with
lex.yy.cpp.diff.
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index c6d86ae0212..31c2c5d9c87 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -63,13 +63,11 @@ CORBA_FE=$(OBJDIR)/bin/flick-fe-newcorba
CORBA_PG=$(OBJDIR)/bin/flick-c-pfe-corbaxx
CORBA_BE=$(OBJDIR)/bin/flick-c-pbe-iiopxx
-%C.h %C.i %C.cpp: %.idl
+$(foreach ext, $(IDL_EXT) $(IDL_EXT2), %$(ext)): %.idl
$(CORBA_FE) $< && \
$(CORBA_PG) -c -o $*-client.prc $*.aoi && \
$(CORBA_BE) $*-client.prc -o $*C.cpp -h $*C.h -f $*S.h && \
echo > $*C.i
-
-%S.h %S.i %S.cpp: %.idl
$(CORBA_FE) $< && \
$(CORBA_PG) -s -o $*-server.prc $*.aoi && \
$(CORBA_BE) $*-server.prc --no_mu_stubs -o $*S.cpp -h $*S.h -F $*C.h && \