diff options
author | naga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-30 04:02:13 +0000 |
---|---|---|
committer | naga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-30 04:02:13 +0000 |
commit | 4d2b25ee0c9ce5921329025de789bb5f6d4945b5 (patch) | |
tree | 22bdaecc67487bc197ad3d43531a6247e701498a | |
parent | 344a78425651910a5d217cb863bcc7032f3b8748 (diff) | |
download | ATCD-4d2b25ee0c9ce5921329025de789bb5f6d4945b5.tar.gz |
Fixed LIBS to LDLIBS in Makefile. Also removed a few warnings for egcs.
51 files changed, 54 insertions, 32 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile index ee685a87c00..416058a3665 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile @@ -15,7 +15,7 @@ FILES = vcr DEFS = $(addsuffix .h,$(FILES)) LSRC = $(addsuffix .cpp,$(FILES)) -LIBS += -lTAO -lACE -lorbsvcs +LDLIBS = -lorbsvcs -lTAO MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source CPPFLAGS += -I$(MPEG_ROOT) @@ -45,7 +45,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # Local targets (and local hacks) #---------------------------------------------------------------------------- -LDFLAGS += -lmpeg_shared -lmpeg_mib -lmpeg_client -lXm -lXext -lXt -lSM -lICE -lX11 -lsocket -lnsl -ldl +LDLIBS += -lmpeg_shared -lmpeg_mib -lmpeg_client -lXm -lXext -lXt -lSM -lICE -lX11 -lsocket -lnsl -ldl CPPFLAGS += -i -DSH_MEM -DNDEBUG -I/project/doc/pkg/X11/include -L/project/doc/pkg/X11/lib realclean: clean diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/vcr.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/vcr.cpp index 728d3c5103b..43c238c56fb 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/vcr.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/vcr.cpp @@ -46,6 +46,7 @@ * email: scen@cse.ogi.edu */ +#include "ace/OS.h" #include <stdio.h> #include <unistd.h> #include <stdlib.h> diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/24bit.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/24bit.cpp index 87931de7f58..8b8c0ee03ed 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/24bit.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/24bit.cpp @@ -21,12 +21,12 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ +#include "ace/OS.h" #include <stdlib.h> #include <string.h> #include "video.h" #include "dither.h" #include "proto.h" -#include "ace/OS.h" ACE_RCSID(mpeg_client, 24bit, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/2x2.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/2x2.cpp index 06bf6ab7fac..43cdea9818b 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/2x2.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/2x2.cpp @@ -21,12 +21,12 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ +#include "ace/OS.h" #include <string.h> #include <stdlib.h> #include "video.h" #include "dither.h" #include "proto.h" -#include "ace/OS.h" ACE_RCSID(mpeg_client, 2x2, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile index 28fef79f620..becd3c3afe7 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile @@ -49,11 +49,11 @@ FILES= 24bit \ MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source CPPFLAGS += -I$(MPEG_ROOT) -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs +LDLIBS = -lTAO DEFS = $(addsuffix .h,$(FILES)) LSRC = $(addsuffix .cpp,$(FILES)) -##LIBS += -lTAO -lACE #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ab.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ab.cpp index 2887981ee52..1edb52d228e 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ab.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ab.cpp @@ -29,6 +29,7 @@ extern int asp[2]; extern void set_exit_routine_tag(int tag); +#include "ace/OS.h" #include "ab.h" ACE_RCSID(mpeg_client, ab, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/audio.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/audio.cpp index b99c7d35cba..dcd4422578f 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/audio.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/audio.cpp @@ -33,6 +33,7 @@ ################################################################# */ +#include "ace/OS.h" #include <stdio.h> #include <errno.h> #include <sys/types.h> diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ctr.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ctr.cpp index 80fa1cedf07..35c9a0dfc76 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ctr.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ctr.cpp @@ -25,6 +25,7 @@ * email: scen@cse.ogi.edu */ +#include "ace/OS.h" #include <stdio.h> #include <errno.h> #include <sys/types.h> diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/decoders.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/decoders.cpp index 43e4373934f..92d6f71332a 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/decoders.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/decoders.cpp @@ -29,6 +29,7 @@ * */ +#include "ace/OS.h" #include <stdio.h> #include <assert.h> #include "decoders.h" diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/file.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/file.cpp index 7caa4bb8621..4a044bec598 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/file.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/file.cpp @@ -25,6 +25,7 @@ * email: scen@cse.ogi.edu */ +#include "ace/OS.h" #include <stdio.h> #include <errno.h> #include <unistd.h> diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.cpp index b5d07070aa1..8739728e397 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.cpp @@ -21,6 +21,7 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ +#include "ace/OS.h" #include <stdlib.h> #include <string.h> #include "video.h" diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2fast.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2fast.cpp index f5eb87c236f..ceee28f4987 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2fast.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2fast.cpp @@ -21,12 +21,12 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ +#include "ace/OS.h" #include <stdlib.h> #include <string.h> #include "video.h" #include "proto.h" #include "dither.h" -#include "ace/OS.h" ACE_RCSID(mpeg_client, fs2fast, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.cpp index 79174685246..a61ba89e4fb 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.cpp @@ -23,6 +23,7 @@ /* This file contains C code to do YCrCb -> colormap space. */ +#include "ace/OS.h" #include <stdlib.h> #include <string.h> #include "fs4.h" diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/global.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/global.cpp index d9a08f49323..a14b12f9cd6 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/global.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/global.cpp @@ -24,7 +24,7 @@ * Department of Computer Science and Engineering * email: scen@cse.ogi.edu */ - +#include "ace/OS.h" #include <stdio.h> #include <sys/types.h> #include <X11/Xlib.h> diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/gray.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/gray.cpp index 71aa8d295d5..4adad5cfbe5 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/gray.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/gray.cpp @@ -21,12 +21,12 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ +#include "ace/OS.h" #include <string.h> #include <stdlib.h> #include "video.h" #include "proto.h" #include "dither.h" -#include "ace/OS.h" ACE_RCSID(mpeg_client, gray, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybrid.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybrid.cpp index 11b969be3a2..0040daec65c 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybrid.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybrid.cpp @@ -23,6 +23,7 @@ /* This file contains C code to implement an ordered dither. */ +#include "ace/OS.h" #include <string.h> #include <stdlib.h> #include "video.h" diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybriderr.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybriderr.cpp index b07d19ea14b..3ea5d8aafbf 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybriderr.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybriderr.cpp @@ -25,12 +25,12 @@ luminance channel and F-S error diffusion on chrominance. */ +#include "ace/OS.h" #include <stdlib.h> #include <string.h> #include "video.h" #include "proto.h" #include "dither.h" -#include "ace/OS.h" ACE_RCSID(mpeg_client, hybriderr, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/jrevdct.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/jrevdct.cpp index 6114517c580..4b98cf3dc1d 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/jrevdct.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/jrevdct.cpp @@ -28,10 +28,10 @@ * matrix, perhaps with the difference cases encoded. */ +#include "ace/OS.h" #include <string.h> #include "video.h" #include "proto.h" -#include "ace/OS.h" ACE_RCSID(mpeg_client, jrevdct, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mb_ordered.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mb_ordered.cpp index 716648959b6..edff6f4990c 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mb_ordered.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mb_ordered.cpp @@ -23,11 +23,11 @@ /* This file contains C code to implement an ordered dither. */ +#include "ace/OS.h" #include <stdlib.h> #include "video.h" #include "proto.h" #include "dither.h" -#include "ace/OS.h" ACE_RCSID(mpeg_client, mb_ordered, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mono.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mono.cpp index 879de356059..9549a90950b 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mono.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mono.cpp @@ -25,12 +25,12 @@ * */ +#include "ace/OS.h" #include <string.h> #include <stdlib.h> #include "video.h" #include "proto.h" #include "dither.h" -#include "ace/OS.h" ACE_RCSID(mpeg_client, mono, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/motionvector.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/motionvector.cpp index e7a2407cd68..3b95e694cdc 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/motionvector.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/motionvector.cpp @@ -21,10 +21,10 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ +#include "ace/OS.h" #include "video.h" #include "proto.h" #include "util.h" -#include "ace/OS.h" ACE_RCSID(mpeg_client, motionvector, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered.cpp index e62806771b2..377077c0f33 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered.cpp @@ -23,11 +23,11 @@ /* This file contains C code to implement an ordered dither. */ +#include "ace/OS.h" #include <stdlib.h> #include "video.h" #include "proto.h" #include "dither.h" -#include "ace/OS.h" ACE_RCSID(mpeg_client, ordered, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered2.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered2.cpp index c57d2ba21e1..42d1d808985 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered2.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered2.cpp @@ -23,11 +23,11 @@ /* This file contains C code to implement an ordered dither. */ +#include "ace/OS.h" #include <stdlib.h> #include "video.h" #include "proto.h" #include "dither.h" -#include "ace/OS.h" ACE_RCSID(mpeg_client, ordered2, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/para.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/para.cpp index de3e5a358f5..331e23830ea 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/para.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/para.cpp @@ -25,6 +25,7 @@ * email: scen@cse.ogi.edu */ +#include "ace/OS.h" #include <stdio.h> #include <errno.h> #include <stdlib.h> diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/parseblock.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/parseblock.cpp index 7c22415443c..9a3168e7067 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/parseblock.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/parseblock.cpp @@ -23,11 +23,11 @@ #define NO_SANITY_CHECKS +#include "ace/OS.h" #include <assert.h> #include "video.h" #include "proto.h" #include "decoders.h" -#include "ace/OS.h" ACE_RCSID(mpeg_client, parseblock, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/prog.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/prog.cpp index 1469e13ac6f..47efee80425 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/prog.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/prog.cpp @@ -25,6 +25,7 @@ * email: scen@cse.ogi.edu */ +#include "ace/OS.h" #include <stdio.h> #include <errno.h> #include <sys/types.h> diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.cpp index 734029da118..01d783344b8 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.cpp @@ -17,6 +17,7 @@ ftp from geom.umn.edu; email: software@geom.umn.edu. */ * email: scen@cse.ogi.edu */ +#include "ace/OS.h" #include <stdio.h> #include <errno.h> #include <stdlib.h> diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.cpp index 8fc6ac680b6..e085616b52a 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.cpp @@ -21,11 +21,11 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ +#include "ace/OS.h" #include <stdlib.h> #include "video.h" #include "proto.h" #include "util.h" -#include "ace/OS.h" ACE_RCSID(mpeg_client, util, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util32.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util32.cpp index 8ac1762823f..38a7926427d 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util32.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util32.cpp @@ -1,12 +1,12 @@ /* $Id$ */ +#include "ace/OS.h" #include <stdio.h> #include <X11/Xlib.h> #include <X11/Xutil.h> #include "video.h" #include "proto.h" #include "ui.h" /* include user interface */ -#include "ace/OS.h" ACE_RCSID(mpeg_client, util32, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.cpp index d8b42ba1f42..ae050b3d595 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.cpp @@ -28,6 +28,7 @@ extern int vsp[2]; extern void set_exit_routine_tag(int tag); +#include "ace/OS.h" #include "vb.h" ACE_RCSID(mpeg_client, vb, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vd.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vd.cpp index 9eb3e6e1c57..2543f0d1014 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vd.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vd.cpp @@ -27,6 +27,7 @@ extern int vdsp[2]; +#include "ace/OS.h" #include <stdio.h> #include <errno.h> #include <signal.h> diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.cpp index 31666f570e2..07c106b63a6 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.cpp @@ -26,6 +26,7 @@ * the video decoder model. */ +#include "ace/OS.h" #include <stdio.h> #include <stdlib.h> #include <assert.h> diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vp.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vp.cpp index e7e75e08e06..1b7e8fdb2f0 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vp.cpp @@ -46,6 +46,7 @@ * email: scen@cse.ogi.edu */ +#include "ace/OS.h" #include <stdio.h> #include <errno.h> #include <signal.h> diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile index 153119a8e25..e8760321d59 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile @@ -32,8 +32,6 @@ FILES= mibButton \ DEFS = $(addsuffix .h,$(FILES)) LSRC = $(addsuffix .cpp,$(FILES)) -##LIBS += -lTAO -lACE - #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) @@ -61,7 +59,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # Local targets (and local hacks) #---------------------------------------------------------------------------- -LDFLAGS += -L/project/doc/pkg/X11/lib/ -lXm -lXt -lXext -lSM -lICE -lX11 -L/project/doc/pkg/X11/lib -lsocket -lnsl -ldl +LDFLAGS += -L/project/doc/pkg/X11/lib/ +LDLIBS += -lXm -lXt -lXext -lSM -lICE -lX11 CPPFLAGS += -DSH_MEM -DNDEBUG -I/project/doc/pkg/X11/include realclean: clean diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.cpp index 39b27581451..7319899863e 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.cpp @@ -10,8 +10,8 @@ ftp from geom.umn.edu; email: software@geom.umn.edu. */ /* Author: Daeron Meyer */ -#include <stdlib.h> #include "mibload.h" +#include <stdlib.h> #include "mibwidgets.h" ACE_RCSID(mpeg_mib, mibload, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.h index 050dd00c110..877fc65c66f 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.h +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.h @@ -9,6 +9,7 @@ ftp from geom.umn.edu; email: software@geom.umn.edu. */ /* Author: Daeron Meyer */ +#include "ace/OS.h" #include <stdio.h> #include <X11/Intrinsic.h> #include <X11/Shell.h> @@ -35,7 +36,6 @@ ftp from geom.umn.edu; email: software@geom.umn.edu. */ #include <Xm/AtomMgr.h> #include <Xm/Protocols.h> #include <Xm/MwmUtil.h> -#include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.cpp index 5244f714eb3..125565cd85f 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS.h" #include "Audio_Control_State.h" #include "Audio_Control_i.h" diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.cpp index 163454cbd80..8aefc6b4823 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS.h" #include "Audio_Control_State.h" #include "Audio_Control_i.h" diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.cpp index ccd14a2a86e..dd493deb76f 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS.h" #include "Audio_Server.h" #include "Audio_Control_i.h" #include "Audio_Control_State.h" diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp index 9392d270a35..33b12c2ba35 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp @@ -25,6 +25,7 @@ * email: scen@cse.ogi.edu */ +#include "ace/OS.h" #include "Globals.h" ACE_RCSID(mpeg_server, Globals, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile index 6a1edd68a98..eb66893e1f0 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile @@ -21,7 +21,7 @@ DEFS = $(addsuffix .h,$(FILES)) LSRC = $(addsuffix .cpp,$(FILES)) -LIBS += -lTAO -lACE -lorbsvcs +LDLIBS += -lorbsvcs -lTAO MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source CPPFLAGS += -I$(MPEG_ROOT) @@ -52,8 +52,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # Local targets (and local hacks) #---------------------------------------------------------------------------- -#LDFLAGS += -L/project/doc/pkg/X11/lib/ -lXm -lXt -lXext -lSM -lICE -lX11 -L/project/doc/pkg/X11/lib -lsocket -lnsl -ldl -LDFLAGS += -lsocket -lnsl -ldl CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG) CPPFLAGS += -DSH_MEM -I/project/doc/pkg/X11/include diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp index dcec2c56c0f..5329111e29e 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS.h" #include "Video_Control_State.h" #include "Video_Server.h" diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp index 8c36fafff77..6ddc19eff1e 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS.h" #include "Video_Control_i.h" #include "mpeg_server/Video_Server.h" diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.cpp index 3d59bd17bb7..8c55585eba6 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.cpp @@ -25,6 +25,7 @@ * email: scen@cse.ogi.edu */ +#include "ace/OS.h" #include "Video_Server.h" #include "orbsvcs/CosNamingC.h" diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/as.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/as.cpp index d631fbfda6a..c4d7efb379a 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/as.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/as.cpp @@ -24,6 +24,8 @@ * Department of Computer Science and Engineering * email: scen@cse.ogi.edu */ +#include "ace/OS.h" +#include "include/common.h" #include <sys/types.h> #include <netdb.h> #include <string.h> @@ -41,7 +43,6 @@ #include <stdio.h> #include <errno.h> #include <signal.h> -#include "include/common.h" #include "mpeg_shared/fileio.h" #include "mpeg_shared/routine.h" #include "mpeg_shared/com.h" diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/las.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/las.cpp index 4a707e68cbf..ebe60992d6a 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/las.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/las.cpp @@ -27,6 +27,7 @@ #if 1 +#include "ace/OS.h" #include <stdio.h> #include <errno.h> #include <sys/types.h> diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/lvs.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/lvs.cpp index c40d6749bc2..0fe4cf2d5cd 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/lvs.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/lvs.cpp @@ -25,6 +25,7 @@ * email: scen@cse.ogi.edu */ +#include "ace/OS.h" #include <stdio.h> #include <errno.h> diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/vs.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/vs.cpp index 23566f19744..759c1a79cc1 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/vs.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/vs.cpp @@ -24,6 +24,7 @@ * Department of Computer Science and Engineering * email: scen@cse.ogi.edu */ +#include "ace/OS.h" #include <sys/types.h> #include <sys/uio.h> #include <unistd.h> diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile index 2fecb4b7d35..98e67cf0668 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile @@ -13,8 +13,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -#TAO_IDLFLAGS = -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h - IDL_FILES = Video_ControlS Video_ControlC Audio_ControlS Audio_ControlC ReceiverS ReceiverC MMDevice_ExporterC MMDevice_ExporterS # On non-Windows environment, we should at least define @@ -29,13 +27,12 @@ LSRC = $(addsuffix .cpp,$(FILES)) FILES += com fileio filters routine sendpt -LDFLAGS += -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG) -I$(TAO_ROOT)/orbsvcs/orbsvcs MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source CPPFLAGS += -I$(MPEG_ROOT) -LIBS += -lTAO -lACE +LDLIBS = -lTAO #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile index 2e259de641a..dccb98b4b80 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile @@ -30,7 +30,7 @@ DEFS = $(addsuffix .h,$(FILES)) LSRC = $(addsuffix .cpp,$(FILES)) -LIBS += -lTAO -lACE -lorbsvcs -lmpeg_server -lmpeg_shared -lrpcsvc +LDLIBS += -lorbsvcs -lTAO -lmpeg_server -lmpeg_shared -lrpcsvc MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source CPPFLAGS += -I$(MPEG_ROOT) -I$(TAO_ROOT)/orbsvcs/orbsvcs diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/as.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/as.cpp index a50f5a09d64..4105e5d2e9e 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/as.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/as.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS.h" #include "mpeg_server/Audio_Server.h" #include "as.h" |