diff options
| author | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-21 13:26:19 +0000 |
|---|---|---|
| committer | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-21 13:26:19 +0000 |
| commit | 40745d32a87fe9d22215bbe635b370cdb346298a (patch) | |
| tree | da2f217f1b0a913c490d9b924da94cd3c79d786b /include | |
| parent | 7955526ea8002e554dc588df2a922785f6a7454a (diff) | |
| download | ATCD-40745d32a87fe9d22215bbe635b370cdb346298a.tar.gz | |
Tue Nov 21 07:24:54 2000 Chris Kohlhoff <chris@kohlhoff.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/makeinclude/build_dll.bor | 5 | ||||
| -rw-r--r-- | include/makeinclude/build_example.bor | 2 | ||||
| -rw-r--r-- | include/makeinclude/build_exe.bor | 5 | ||||
| -rw-r--r-- | include/makeinclude/build_lib.bor | 5 |
4 files changed, 17 insertions, 0 deletions
diff --git a/include/makeinclude/build_dll.bor b/include/makeinclude/build_dll.bor index ed69fb84917..eae45eb5f41 100644 --- a/include/makeinclude/build_dll.bor +++ b/include/makeinclude/build_dll.bor @@ -16,10 +16,14 @@ !include <$(ACE_ROOT)\include\makeinclude\outputdir.bor> !include <$(ACE_ROOT)\include\makeinclude\compiler.bor> +!ifdef NAME TARGET = $(BINDIR)\$(NAME)$(LIB_DECORATOR).dll +!endif all: $(TARGET) + @echo Do nothing >NUL +!ifdef TARGET $(TARGET): $(OBJFILES) $(RESOURCE) @$(MAKE_BINDIR) $(LD) @&&! @@ -32,6 +36,7 @@ $(TARGET): $(OBJFILES) $(RESOURCE) !ifndef DEBUG @del $(TARGET:.dll=.tds) !endif +!endif !include <$(ACE_ROOT)\include\makeinclude\clean.bor> diff --git a/include/makeinclude/build_example.bor b/include/makeinclude/build_example.bor index cff9e8236aa..2a1d2bda837 100644 --- a/include/makeinclude/build_example.bor +++ b/include/makeinclude/build_example.bor @@ -9,6 +9,7 @@ CFLAGS = \ $(TAO_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_NAMING_CFLAGS) LIBFILES = \ @@ -16,6 +17,7 @@ LIBFILES = \ $(TAO_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_SVC_UTILS_LIB) \ $(TAO_NAMING_LIB) !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor index f3153a2476f..a0e1ba3b948 100644 --- a/include/makeinclude/build_exe.bor +++ b/include/makeinclude/build_exe.bor @@ -17,10 +17,14 @@ !include <$(ACE_ROOT)\include\makeinclude\outputdir.bor> !include <$(ACE_ROOT)\include\makeinclude\compiler.bor> +!ifdef NAME TARGET = $(BINDIR)\$(NAME).exe +!endif all: $(TARGET) + @echo Do nothing >NUL +!ifdef TARGET $(TARGET): $(OBJFILES) $(RESOURCE) @$(MAKE_BINDIR) $(LD) @&&! @@ -33,6 +37,7 @@ $(TARGET): $(OBJFILES) $(RESOURCE) !ifndef DEBUG @del $(TARGET:.exe=.tds) !endif +!endif !include <$(ACE_ROOT)\include\makeinclude\clean.bor> diff --git a/include/makeinclude/build_lib.bor b/include/makeinclude/build_lib.bor index 73c09fa9218..4877ac0512b 100644 --- a/include/makeinclude/build_lib.bor +++ b/include/makeinclude/build_lib.bor @@ -16,16 +16,21 @@ !include <$(ACE_ROOT)\include\makeinclude\outputdir.bor> !include <$(ACE_ROOT)\include\makeinclude\compiler.bor> +!ifdef NAME TARGET = $(BINDIR)\$(NAME)$(LIB_DECORATOR).lib +!endif all: $(TARGET) + @echo Do nothing >NUL +!ifdef TARGET $(TARGET): $(OBJFILES) @$(MAKE_BINDIR) $(AR) $(LIB_LFLAGS) $(TARGET) @&&! +-$(**: = &^ +-) ! +!endif !include <$(ACE_ROOT)\include\makeinclude\clean.bor> |