Fix up "make depend" so it works correctly

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2017-08-07 00:23:53 -04:00
parent df22acea06
commit 2fbe51a75d
2 changed files with 20 additions and 10 deletions

View File

@ -32,9 +32,19 @@ all:: pwgen
.c.o:
$(CC) -c $(ALL_CFLAGS) $< -o $@
OBJS= pwgen.o pw_phonemes.o pw_rand.o randnum.o sha1.o sha1num.o
OBJS= pwgen.o \
pw_phonemes.o \
pw_rand.o \
randnum.o \
sha1.o \
sha1num.o
SRCS= pwgen.c pw_phonemes.c pw_rand.c randnum.c sha1.c sha1num.c
SRCS= $(srcdir)/pwgen.c \
$(srcdir)/pw_phonemes.c \
$(srcdir)/pw_rand.c \
$(srcdir)/randnum.c \
$(srcdir)/sha1.c \
$(srcdir)/sha1num.c
pwgen: $(OBJS)
@ -123,9 +133,9 @@ depend:: .depend
# Makefile dependencies follow. This must be the last section in
# the Makefile.in file
#
pwgen.o: pwgen.c pwgen.h
pw_phonemes.o: pw_phonemes.c pwgen.h
pw_rand.o: pw_rand.c pwgen.h
randnum.o: randnum.c pwgen.h
sha1.o: sha1.c sha1.h
sha1num.o: sha1num.c sha1.h pwgen.h
pwgen.o: $(srcdir)/pwgen.c $(srcdir)/pwgen.h
pw_phonemes.o: $(srcdir)/pw_phonemes.c $(srcdir)/pwgen.h
pw_rand.o: $(srcdir)/pw_rand.c $(srcdir)/pwgen.h
randnum.o: $(srcdir)/randnum.c $(srcdir)/pwgen.h
sha1.o: $(srcdir)/sha1.c $(srcdir)/sha1.h
sha1num.o: $(srcdir)/sha1num.c $(srcdir)/pwgen.h $(srcdir)/sha1.h

View File

@ -9,8 +9,8 @@ while (<>) {
}
next if (/^$/); # skip blank lines
$linelen = 0;
split;
while (defined($word = shift @_)) {
@words = split;
while (defined($word = shift @words)) {
$word =~ s#\$\(srcdir\)/\.\./version.h#\$\(top_srcdir\)/version.h#;
$word =~ s#\$\(srcdir\)/.\.\/\.\./version.h#\$\(top_srcdir\)/version.h#;
$word =~ s#\$\(srcdir\)/.\.\/et/com_err.h#\$\(top_srcdir\)/lib/et/com_err.h#;