Skip to content

Commit

Permalink
dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
zebe committed Jun 28, 2015
1 parent 0082e0d commit 03f75e7
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion common/confmenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1477,7 +1477,7 @@ static int __configure( Client *client ) /* returns >0==success, <0==cancelled *
returnvalue = -1;
}

/* -- massage mapped options and dependancies back into place -- */
/* -- massage mapped options and dependencies back into place -- */

if (returnvalue != -1)
{
Expand Down
16 changes: 8 additions & 8 deletions common/testplat.cpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*
* Copyright distributed.net 1997-2011 - All Rights Reserved
* Copyright distributed.net 1997-2015 - All Rights Reserved
* For use in distributed.net projects only.
* Any other distribution or use of this source violates copyright.
*
* This file contains functions used from ./configure
* Specify 'build_dependancies' as argument
* Specify 'build_dependencies' as argument
* (which is all this needs to do anymore)
*
* $Id: testplat.cpp,v 1.16 2011/03/31 05:07:30 jlawson Exp $
* $Id: testplat.cpp,v 1.17 2015/06/27 21:52:52 zebe Exp $
*/
#include <stdio.h> /* fopen()/fclose()/fread()/fwrite()/NULL */
#include <string.h> /* strlen()/memmove() */
Expand Down Expand Up @@ -110,7 +110,7 @@ static void delete_list(name_list **list)
struct name_list *seen_files = NULL;
struct name_list *seen_deps = NULL;

static unsigned int build_dependancies( const char *cppname, /* ${TARGETSRC} */
static unsigned int build_dependencies( const char *cppname, /* ${TARGETSRC} */
const char **include_dirs,
unsigned int count )
{
Expand Down Expand Up @@ -177,7 +177,7 @@ static unsigned int build_dependancies( const char *cppname, /* ${TARGETSRC} */
fprintf(stderr, "%d) '%s'%s\n", l, foundbuf, fileexists(foundbuf)?" *":"");
if (fileexists( foundbuf ))
{
count = build_dependancies( origbuf, include_dirs, count );
count = build_dependencies( origbuf, include_dirs, count );
break;
}
if (!include_dirs)
Expand Down Expand Up @@ -266,16 +266,16 @@ int main(int argc, char *argv[])
{
if (argc < 2)
{
fprintf(stderr,"Specify 'build_dependancies' as argument.\n");
fprintf(stderr,"Specify 'build_dependencies' as argument.\n");
return -1;
}
if (strcmp(argv[1], "build_dependancies" )== 0)
if (strcmp(argv[1], "build_dependencies" )== 0)
{
const char **idirs;
//fprintf(stderr,"%s 1\n", argv[2] );
idirs = get_include_dirs(argc,argv);
//fprintf(stderr,"%s 2\n", argv[2] );
build_dependancies( argv[2], idirs, 0 );
build_dependencies( argv[2], idirs, 0 );
printf("\n");
//fprintf(stderr,"%s 3\n", argv[2] );
if (idirs)
Expand Down
2 changes: 1 addition & 1 deletion common/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* misc functions that don't fit anywhere else.
*
* Note that this file may be included from anywhere, and should
* therefore not have any non-standard dependancies (eg, 'u32', 'Stub' etc)
* therefore not have any non-standard dependencies (eg, 'u32', 'Stub' etc)
* ----------------------------------------------------------------
*/
#ifndef __UTIL_H__
Expand Down
12 changes: 6 additions & 6 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -3419,7 +3419,7 @@ else
cc common/testplat.cpp -o testplat
fi
echo "Checking test program..."
./testplat build_dependancies common/client.cpp > /dev/null
./testplat build_dependencies common/client.cpp > /dev/null
if [ $? -ne 0 ]; then
echo "Execution failed. Check your library search path."
exit 1
Expand Down Expand Up @@ -3979,7 +3979,7 @@ if [ -n "${TARGET_SRCOBJLIST}" ]; then
CCFLAGS_SELECT="${CCFLAGS_SELECT} -maltivec"
fi
fi
deplist=`./testplat build_dependancies ${TARGETSRC} ${TARGET_INCSWITCHES}`
deplist=`./testplat build_dependencies ${TARGETSRC} ${TARGET_INCSWITCHES}`
echo "$target: ${TARGETSRC} ${deplist}" >> Makefile
echo " \${CC} -c ${CCFLAGS_SELECT} ${TARGETSRC} -o $target" >> Makefile
echo "" >> Makefile
Expand Down Expand Up @@ -4076,7 +4076,7 @@ if [ -n "${TARGET_SRCOBJLIST}" ]; then
CORE=TARGETSRC
fi
done
TARGET_HDEPS=`./testplat build_dependancies ${TARGETSRC} ${TARGET_INCSWITCHES}`
TARGET_HDEPS=`./testplat build_dependencies ${TARGETSRC} ${TARGET_INCSWITCHES}`
echo "$target: $TARGETSRC $TARGET_HDEPS" >> Makefile
echo " \${SPUCC} -c -Dlinux -O3 -Wall -Wextra \${HPATHS} -DCORE_NAME=$CORE $TARGETSRC -o $target" >> Makefile
echo "" >> Makefile
Expand All @@ -4101,7 +4101,7 @@ if [ -n "${TARGET_SRCOBJLIST}" ]; then
TARGETSRC=""
# ------------------------------------
elif [ "${TARGETTYP}" = "cu" ]; then
deplist=`./testplat build_dependancies ${TARGETSRC} ${TARGET_INCSWITCHES}`
deplist=`./testplat build_dependencies ${TARGETSRC} ${TARGET_INCSWITCHES}`
echo "$target: ${TARGETSRC} ${deplist}" >> Makefile
CUDA_CODEGEN="--generate-code arch=compute_10,code=compute_10 --generate-code arch=compute_30,code=compute_30 --generate-code arch=compute_35,code=compute_35"
echo " \${NVCC} --ptx --compiler-options \"\${NVCCFLAGS}\" ${TARGETSRC} -o $target.ptx" >> Makefile
Expand All @@ -4120,7 +4120,7 @@ fi
if [ "$TARGET_OGRNG_MULTI" = "68k" ]; then
echo "Generating Makefile 68k multi-core OGR-NG dependency targets..."
TARGETSRC="$OGR/ansi/ogrng-32.cpp"
TARGET_HDEPS=`./testplat build_dependancies ${TARGETSRC} ${TARGET_INCSWITCHES}`
TARGET_HDEPS=`./testplat build_dependencies ${TARGETSRC} ${TARGET_INCSWITCHES}`
OGR68K="000 020 030 040 060"
for targetext in ${OGR68K}; do
deplist=""
Expand Down Expand Up @@ -4155,7 +4155,7 @@ fi
if [ "$TARGET_OGR_MULTI" = "68k" ]; then
echo "Generating Makefile 68k multi-core OGR dependency targets..."
TARGETSRC="$OGR/68k/ogr-68k.cpp"
TARGET_HDEPS=`./testplat build_dependancies ${TARGETSRC} ${TARGET_INCSWITCHES}`
TARGET_HDEPS=`./testplat build_dependencies ${TARGETSRC} ${TARGET_INCSWITCHES}`
OGR68K="000 020 030 040 060"
for targetext in ${OGR68K}; do
deplist=""
Expand Down
2 changes: 1 addition & 1 deletion docs/readme.nw
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
its built-in commands first, which effectively negates the use of the
-pause, -unpause, -restart and -shutdown switches.

Dependancies (or not):
Dependencies (or not):

A3112.NLM: is *required* by this version of the client.
NetWare 3.x users who do not have this file in their SYS:/SYSTEM
Expand Down
2 changes: 1 addition & 1 deletion makefile.wat
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ known_tgts=netware dos win16 win32 os2# list of known (possible) builds
# this list can be added to in the platform specific section
# (+3 desmmx, +2 mt, +x plat specific)

%PRELINKDEPS = # dependancies that need 'compiling' but not linking (eg .RC's)
%PRELINKDEPS = # dependencies that need 'compiling' but not linking (eg .RC's)
%POSTLINKTGTS= # targets to make after linking (bind etc)

#---
Expand Down
2 changes: 1 addition & 1 deletion plat/linux/resolv.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
* static, this may not be feasable, and is in fact not recommended
* by the glibc maintainer <[email protected]>).
* The dynamic resolver isn't compatible to anything other than the
* 'current' versions of the external dependancies, which naturally
* 'current' versions of the external dependencies, which naturally
* may or may not be same version as the dynamic resolver itself.
* - Due to a mutex bug in glibc, using glibc's dynamic linker
* interface will eventually hang the process when running
Expand Down
6 changes: 3 additions & 3 deletions plat/win/w32svc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -919,9 +919,9 @@ int win32CliInstallService(int quiet)
else
{
/* TDI=DHCP client+DNS client (depend on PNP_TDI=tcpip etc) */
const char *dependancies = "+TDI\0+NetworkProvider\0\0";
const char *dependencies = "+TDI\0+NetworkProvider\0\0";
if (ras_detect_state > 0)
dependancies = "RasMan\0+TDI\0+NetworkProvider\0\0";
dependencies = "RasMan\0+TDI\0+NetworkProvider\0\0";

__GetMyModuleFilename( &buffer[1], sizeof(buffer)-1);
buffer[0] = '\"';
Expand All @@ -933,7 +933,7 @@ int win32CliInstallService(int quiet)
(char *)APPDESCRIP, SERVICE_ALL_ACCESS,
SERVICE_WIN32_OWN_PROCESS,
SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
buffer, 0, 0, dependancies, 0, 0);
buffer, 0, 0, dependencies, 0, 0);
if (!myService)
{
errnum = GetLastError();
Expand Down

0 comments on commit 03f75e7

Please sign in to comment.