diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-07-26 01:35:25 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-07-26 01:35:25 +0000 |
| commit | ccdbb4d7b6c4d0da0d23da1981246d68509f632a (patch) | |
| tree | a26c6985ed3351324a51ccd65e8e9c445c1cd114 | |
| parent | 2f9372bcb67646ead70ed1373505932910c564f1 (diff) | |
| download | ATCD-ccdbb4d7b6c4d0da0d23da1981246d68509f632a.tar.gz | |
ChangeLogTag: Wed Jul 25 20:33:21 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/examples/Simple/time-date/Makefile.bor | 2 | ||||
| -rw-r--r-- | TAO/examples/Simple/time-date/server.bor | 12 | ||||
| -rw-r--r-- | TAO/examples/Simple/time-date/time_date.bor | 45 |
4 files changed, 55 insertions, 12 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 3e6b5b78968..10cd6e58882 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Wed Jul 25 20:33:21 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * examples/Simple/time-date/Makefile.bor: + * examples/Simple/time-date/server.bor: + * examples/Simple/time-date/time_date.bor: Fixed Borland builds + for this example. This commit is for Johnny Willemsen who is + away from his work. + Wed Jul 25 12:50:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> * tao/Strategies/DIOP_Factory.cpp: diff --git a/TAO/examples/Simple/time-date/Makefile.bor b/TAO/examples/Simple/time-date/Makefile.bor index 96d11c0b8d7..fac678ed834 100644 --- a/TAO/examples/Simple/time-date/Makefile.bor +++ b/TAO/examples/Simple/time-date/Makefile.bor @@ -2,7 +2,7 @@ # Makefile for building the Time-date example # -MAKEFILES = client.bor server.bor +MAKEFILES = time_date.bor client.bor server.bor !include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/examples/Simple/time-date/server.bor b/TAO/examples/Simple/time-date/server.bor index 6e389f567c0..432d6cf30c1 100644 --- a/TAO/examples/Simple/time-date/server.bor +++ b/TAO/examples/Simple/time-date/server.bor @@ -5,14 +5,11 @@ NAME = server OBJFILES = \ - $(OBJDIR)\Time_DateC.obj \ - $(OBJDIR)\Time_DateS.obj \ - $(OBJDIR)\Time_Date_i.obj \ $(OBJDIR)\Simple_util.obj \ $(OBJDIR)\server.obj IDLFILES = \ - $(IDLDIR)\Time_Date.idl + $(BINDIR)\TimeDate$(LIB_DECORATOR).lib CPPDIR = .;.. @@ -20,10 +17,3 @@ IDLDIR = . !include <$(ACE_ROOT)\include\makeinclude\build_example.bor> -# -# IDL Build rules -# - -$(IDLDIR)\Time_DateC.cpp $(IDLDIR)\Time_DateS.cpp: $(IDLDIR)\Time_Date.idl - $(TAO_IDL) $** - diff --git a/TAO/examples/Simple/time-date/time_date.bor b/TAO/examples/Simple/time-date/time_date.bor new file mode 100644 index 00000000000..22e8602a12b --- /dev/null +++ b/TAO/examples/Simple/time-date/time_date.bor @@ -0,0 +1,45 @@ +# +# Makefile for building the time-date library +# + +NAME = Time_Date + +TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 + +OBJFILES = \ + $(OBJDIR)\Time_DateS.obj \ + $(OBJDIR)\Time_Date.obj \ + $(OBJDIR)\Time_Date_i.obj \ + $(OBJDIR)\Time_DateC.obj + +CFLAGS = \ + $(ACE_CFLAGS) \ + $(TAO_CFLAGS) \ + $(TAO_COSNAMING_CFLAGS) \ + $(TAO_SVCUTILS_CFLAGS) \ + $(TAO_IORTABLE_CFLAGS) \ + $(TAO_PORTABLESERVER_CFLAGS) + +LIBFILES = \ + $(ACE_LIB) \ + $(TAO_LIB) \ + $(TAO_COSNAMING_LIB) \ + $(TAO_SVCUTILS_LIB) \ + $(TAO_IORTABLE_LIB) \ + $(TAO_PORTABLESERVER_LIB) + +IDLFILES = \ + $(IDLDIR)\Time_Date.idl + +CPPDIR = .;.. + +IDLDIR = . + +!include <$(ACE_ROOT)\include\makeinclude\build_library.bor> + +# +# IDL Build rules +# + +$(IDLDIR)\Time_DateC.cpp $(IDLDIR)\Time_DateS.cpp: $(IDLDIR)\Time_Date.idl + $(TAO_IDL) $** |