isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer depend on VPATH; pointed out a bunch of missed dependencies.

Browse Source
This commit is contained in:
Todd C. Miller
2005-02-05 22:56:20 +00:00
parent b2f7e61ff3
commit c20f64d2f1
2 changed files with 99 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
INSTALL.configure
View File

@@ -69,17 +69,10 @@ Compiling For Multiple Architectures
You can compile the package for more than one kind of computer at the You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that own directory. `cd' to the directory where you want the object files
supports the `VPATH' variable, such as GNU `make'. `cd' to the and executables to go and run the `configure' script. `configure'
directory where you want the object files and executables to go and run automatically checks for the source code in the directory that `configure'
the `configure' script. `configure' automatically checks for the is in and in `..'.
source code in the directory that `configure' is in and in `..'.
If you have to use a `make' that does not supports the `VPATH'
variable, you have to compile the package for one architecture at a time
in the source code directory. After you have installed the package for
one architecture, use `make distclean' before reconfiguring for another
architecture.
Installation Names Installation Names
================== ==================

141
Makefile.in
View File

@@ -29,7 +29,6 @@ srcdir = @srcdir@
devdir = @devdir@ devdir = @devdir@
authdir = $(srcdir)/auth authdir = $(srcdir)/auth
top_builddir = . top_builddir = .
VPATH = @srcdir@
# Compiler & tools to use # Compiler & tools to use
CC = @CC@ CC = @CC@
@@ -154,7 +153,8 @@ BINFILES= BUGS CHANGES HISTORY LICENSE README TODO TROUBLESHOOTING \
BINSPECIAL= INSTALL.binary Makefile.binary.in libtool BINSPECIAL= INSTALL.binary Makefile.binary.in libtool
SUDODEP = $(srcdir)/sudo.h $(srcdir)/compat.h $(srcdir)/defaults.h \ SUDODEP = $(srcdir)/sudo.h $(srcdir)/compat.h $(srcdir)/defaults.h \
$(srcdir)/error.h $(srcdir)/logging.h config.h def_data.h pathnames.h $(srcdir)/error.h $(srcdir)/logging.h $(devdir)/def_data.h \
pathnames.h config.h
AUTHDEP = $(SUDODEP) $(authdir)/sudo_auth.h AUTHDEP = $(SUDODEP) $(authdir)/sudo_auth.h
@@ -191,14 +191,14 @@ sudo_noexec.la: sudo_noexec.lo
@DEV@GENERATED = gram.h gram.c toke.c def_data.c def_data.h @DEV@GENERATED = gram.h gram.c toke.c def_data.c def_data.h
# Uncomment the $(YACC) and mv lines if you intend to modify gram.y # Uncomment the $(YACC) and mv lines if you intend to modify gram.y
$(devdir)/gram.c gram.h: gram.y $(devdir)/gram.c gram.h: $(srcdir)/gram.y
@DEV@ $(YACC) -d $(srcdir)/gram.y @DEV@ $(YACC) -d $(srcdir)/gram.y
@DEV@ mv -f y.tab.c gram.c @DEV@ mv -f y.tab.c gram.c
@DEV@ mv -f y.tab.h gram.h @DEV@ mv -f y.tab.h gram.h
-@true -@true
# Uncomment the $(LEX) and mv lines if you intend to modify toke.l # Uncomment the $(LEX) and mv lines if you intend to modify toke.l
$(devdir)/toke.c: toke.l $(devdir)/toke.c: $(srcdir)/toke.l
@DEV@ $(LEX) $(srcdir)/toke.l @DEV@ $(LEX) $(srcdir)/toke.l
@DEV@ mv -f lex.yy.c toke.c @DEV@ mv -f lex.yy.c toke.c
-@true -@true
@@ -208,44 +208,99 @@ $(devdir)/toke.c: toke.l
@DEV@ perl $(srcdir)/mkdefaults -o def_data $(srcdir)/def_data.in @DEV@ perl $(srcdir)/mkdefaults -o def_data $(srcdir)/def_data.in
# Dependencies (not counting auth functions) # Dependencies (not counting auth functions)
alloc.o: alloc.c $(SUDODEP) alias.o: $(devdir)/alias.c $(SUDODEP) $(srcdir)/parse.h $(srcdir)/redblack.h
check.o: check.c $(SUDODEP) $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/alias.c
closefrom.o: closefrom.c config.h alloc.o: $(srcdir)/alloc.c $(SUDODEP)
env.o: env.c $(SUDODEP) $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/alloc.c
error.o: error.c config.h compat.h error.h alloca.o: $(srcdir)/alloca.c
fileops.o: fileops.c $(SUDODEP) $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/alloca.c
find_path.o: find_path.c $(SUDODEP) check.o: $(srcdir)/check.c $(SUDODEP)
getprogname.o: getprogname.c config.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/check.c
getspwuid.o: getspwuid.c $(SUDODEP) closefrom.o: $(srcdir)/closefrom.c config.h
goodpath.o: goodpath.c $(SUDODEP) $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/closefrom.c
logging.o: logging.c $(SUDODEP) defaults.o: $(srcdir)/defaults.c $(SUDODEP) $(srcdir)/def_data.c $(authdir)/sudo_auth.h $(devdir)/gram.h
set_perms.o: set_perms.c $(SUDODEP) $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/defaults.c
tgetpass.o: tgetpass.c $(SUDODEP) env.o: $(srcdir)/env.c $(SUDODEP)
visudo.o: visudo.c $(SUDODEP) version.h $(devdir)/gram.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/env.c
sudo.o: sudo.c $(SUDODEP) interfaces.h version.h error.o: $(srcdir)/error.c $(srcdir)/compat.h $(srcdir)/error.h config.h
interfaces.o: interfaces.c $(SUDODEP) interfaces.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/error.c
testsudoers.o: testsudoers.c $(SUDODEP) parse.h interfaces.h $(devdir)/gram.h fileops.o: $(srcdir)/fileops.c $(SUDODEP)
match.o: match.c $(SUDODEP) parse.h interfaces.h $(devdir)/gram.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/fileops.c
parse.o: parse.c $(SUDODEP) parse.h $(devdir)/gram.h find_path.o: $(srcdir)/find_path.c $(SUDODEP)
pwutil.o: pwutil.c $(SUDODEP) $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/find_path.c
toke.o: $(devdir)/toke.c $(SUDODEP) parse.h $(devdir)/gram.h fnmatch.o: $(srcdir)/fnmatch.c $(srcdir)/emul/fnmatch.h $(srcdir)/compat.h config.h
gram.o: $(devdir)/gram.c $(SUDODEP) parse.h $(devdir)/gram.h redblack.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/fnmatch.c
defaults.o: defaults.c $(SUDODEP) def_data.c auth/sudo_auth.h $(devdir)/gram.h getcwd.o: $(srcdir)/getcwd.c $(srcdir)/compat.h config.h
fnmatch.o: fnmatch.c config.h compat.h emul/fnmatch.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/getcwd.c
getcwd.o: getcwd.c config.h compat.h getprogname.o: $(srcdir)/getprogname.c config.h
snprintf.o: snprintf.c config.h compat.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/getprogname.c
strcasecmp.o: strcasecmp.c config.h getspwuid.o: $(srcdir)/getspwuid.c $(SUDODEP)
strlcat.o: strlcat.c config.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/getspwuid.c
strlcpy.o: strlcpy.c config.h gettime.o: $(srcdir)/gettime.c $(SUDODEP)
strerror.o: strerror.c config.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/gettime.c
utime.o: utime.c config.h pathnames.h compat.h emul/utime.h glob.o: $(srcdir)/glob.c $(srcdir)/emul/glob.h $(srcdir)/compat.h config.h
ldap.o: ldap.c $(SUDODEP) parse.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/glob.c
mon_systrace.o: mon_systrace.c $(SUDODEP) mon_systrace.h goodpath.o: $(srcdir)/goodpath.c $(SUDODEP)
tsgetgrpw.o: tsgetgrpw.c $(SUDODEP) $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/goodpath.c
tspwutil.o: pwutil.c $(SUDODEP) gram.o: $(devdir)/gram.c $(SUDODEP) $(srcdir)/parse.h $(devdir)/gram.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/gram.c
interfaces.o: $(srcdir)/interfaces.c $(SUDODEP) $(srcdir)/interfaces.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/interfaces.c
ldap.o: $(srcdir)/ldap.c $(SUDODEP) $(srcdir)/parse.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/ldap.c
logging.o: $(srcdir)/logging.c $(SUDODEP)
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/logging.c
match.o: $(srcdir)/match.c $(SUDODEP) $(srcdir)/parse.h $(srcdir)/interfaces.h $(devdir)/gram.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/match.c
mon_solaris.o: $(srcdir)/mon_solaris.c $(SUDODEP) $(srcdir)/mon_solaris.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/mon_solaris.c
mon_systrace.o: $(srcdir)/mon_systrace.c $(SUDODEP) $(srcdir)/mon_systrace.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/mon_systrace.c
parse.o: $(srcdir)/parse.c $(SUDODEP) $(srcdir)/parse.h $(devdir)/gram.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/parse.c
pwutil.o: $(srcdir)/pwutil.c $(SUDODEP)
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/pwutil.c
redblack.o: $(srcdir)/redblack.c $(SUDODEP) $(srcdir)/redblack.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/redblack.c
set_perms.o: $(srcdir)/set_perms.c $(SUDODEP)
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/set_perms.c
sigaction.o: $(srcdir)/sigaction.c $(srcdir)/compat.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sigaction.c
snprintf.o: $(srcdir)/snprintf.c $(srcdir)/compat.h config.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/snprintf.c
strcasecmp.o: $(srcdir)/strcasecmp.c $(srcdir)/compat.h config.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/strcasecmp.c
strerror.o: $(srcdir)/strerror.c $(srcdir)/compat.h config.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/strerror.c
strlcat.o: $(srcdir)/strlcat.c $(srcdir)/compat.h config.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/strlcat.c
strlcpy.o: $(srcdir)/strlcpy.c $(srcdir)/compat.h config.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/strlcpy.c
sudo.o: $(srcdir)/sudo.c $(SUDODEP) $(srcdir)/interfaces.h $(srcdir)/version.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo.c
sudo_edit.o: $(srcdir)/sudo_edit.c $(SUDODEP)
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_edit.c
sudo_noexec.o: $(srcdir)/sudo_noexec.c $(srcdir)/compat.h config.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_noexec.c
testsudoers.o: $(srcdir)/testsudoers.c $(SUDODEP) $(srcdir)/parse.h $(srcdir)/interfaces.h $(devdir)/gram.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/testsudoers.c
tgetpass.o: $(srcdir)/tgetpass.c $(SUDODEP)
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/tgetpass.c
toke.o: $(devdir)/toke.c $(SUDODEP) $(srcdir)/parse.h $(devdir)/gram.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/toke.c
tsgetgrpw.o: $(srcdir)/tsgetgrpw.c $(SUDODEP)
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/tsgetgrpw.c
utimes.o: $(srcdir)/utimes.c $(srcdir)/compat.h $(srcdir)/emul/utime.h config.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/utimes.c
visudo.o: $(srcdir)/visudo.c $(SUDODEP) $(srcdir)/version.h $(devdir)/gram.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/visudo.c
zero_bytes.o: $(srcdir)/zero_bytes.c $(srcdir)/compat.h config.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/zero_bytes.c
# Private copy of pwutil.o with MYPW defined for testsudoers
tspwutil.o: $(srcdir)/pwutil.c $(SUDODEP)
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) -DMYPW -o tspwutil.o $(srcdir)/pwutil.c $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) -DMYPW -o tspwutil.o $(srcdir)/pwutil.c
# Authentication functions live in "auth" dir and so need extra care
sudo_auth.o: $(authdir)/sudo_auth.c $(AUTHDEP) $(INSDEP) sudo_auth.o: $(authdir)/sudo_auth.c $(AUTHDEP) $(INSDEP)
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(authdir)/sudo_auth.c $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(authdir)/sudo_auth.c
afs.o: $(authdir)/afs.c $(AUTHDEP) afs.o: $(authdir)/afs.c $(AUTHDEP)
@@ -341,12 +396,6 @@ install-man:
check: check:
@echo nothing to check @echo nothing to check
tags: $(SRCS)
ctags $(SRCS)
TAGS: $(SRCS)
etags $(SRCS)
clean: clean:
-rm -f *.o $(PROGS) testsudoers core sudo.core visudo.core \ -rm -f *.o $(PROGS) testsudoers core sudo.core visudo.core \
testsudoers.core testsudoers.core