Try to fix the build code.

[~andy/fetchmail] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 78663dc57e165bf4a77c38f7b6546ebb5b5efd99..b897c13b065167cf78001f158073daafee72dc4a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
 # If you're running QNX, we can't assume a working autoconf.
 # So just uncomment all the lines marked QNX.
 
-VERS=4.0.2
+VERS=4.0.4
 
 # Ultrix 2.2 make doesn't expand the value of VPATH.
 srcdir = @srcdir@
@@ -108,7 +108,7 @@ rfc822: rfc822.c
        gcc -DTESTMAIN -g rfc822.c -o rfc822
 
 .c.o:
-       $(CC) $(defines) -c -I$(srcdir) $(CFLAGS) $< $(OUTPUT_OPTION)
+       $(CC) $(defines) -c -I$(srcdir) -I. $(CFLAGS) $< $(OUTPUT_OPTION)
 
 # For some losing Unix makes.
 SHELL = /bin/sh
@@ -153,16 +153,14 @@ realclean: distclean # fetchmail.info*
 
 mostlyclean: clean
 
-Makefile: config.status $(srcdir)/Makefile.in
-       $(SHELL) config.status
-       @echo "You can ignore any makedepend error messages"
-       -makedepend -I$(srcdir) -I. -fMakefile *.c
+config.status: configure
+       $(srcdir)/configure
 
-config.h: stamp-config 
+config.h: config.status config.h.in
+       sh config.status; touch config.h
 
-stamp-config: config.status $(srcdir)/config.h.in
-       $(SHELL) config.status
-       touch stamp-config
+Makefile: config.status Makefile.in
+       sh config.status
 
 configure: configure.in
        autoconf $(ACFLAGS)
@@ -173,17 +171,19 @@ config.h.in: acconfig.h configure.in
 # This tells versions [3.59,3.63) of GNU make not to export all variables.
 .NOEXPORT:
 
-# Special dependencies, not easily handled without explicit rules
-rcfile_l.o rcfile_l.h: $(srcdir)/rcfile_l.l
-       $(LEX) $(LEXFLAGS) $<
-       mv lex.yy.c $*.c
-       $(CC) $(defines) -c -I$(srcdir) -I. $(CFLAGS) $*.c $(OUTPUT_OPTION)
+# Special dependencies, not easily handled portably without explicit rules
+rcfile_l.c rcfile_l.h: $(srcdir)/rcfile_l.l
+       $(LEX) $(LEXFLAGS) $(srcdir)/rcfile_l.l
+       mv lex.yy.c rcfile_l.c
+rcfile_y.c rcfile_y.h: $(srcdir)/rcfile_y.y
+       $(YACC) $(YACCFLAGS) $(srcdir)/rcfile_y.y
+       mv y.tab.c rcfile_y.c
+       mv -f y.tab.h rcfile_y.h
 
-rcfile_y.o rcfile_y.h: $(srcdir)/rcfile_y.y
-       $(YACC) $(YACCFLAGS) $<
-       mv y.tab.c $*.c
-       mv -f y.tab.h $*.h
-       $(CC) $(defines) -c -I$(srcdir) -I. $(CFLAGS) $*.c $(OUTPUT_OPTION)
+# These must be explicit, because the .c files often don't exist at
+# makefile build time. 
+rcfile_l.o: rcfile_y.c rcfile_y.h config.h fetchmail.h
+rcfile_y.o: rcfile_y.c rcfile_y.h config.h fetchmail.h
 
 parser = $(srcdir)/rcfile_l.l $(srcdir)/rcfile_y.y
 headers = $(srcdir)/fetchmail.h $(srcdir)/socket.h $(srcdir)/smtp.h \
@@ -202,7 +202,7 @@ config = $(srcdir)/Makefile.in $(srcdir)/configure.in $(srcdir)/configure \
 scripts = $(srcdir)/install.sh $(srcdir)/mkinstalldirs \
        $(srcdir)/specgen.sh $(srcdir)/lsmgen.sh
 all = $(docs) $(config) $(srcs) $(parser) $(headers) $(extra) $(scripts) \
-       $(srcdir)/contrib/* $(srcdir)/MANIFEST
+       $(srcdir)/contrib/* $(srcdir)/MANIFEST $(srcdir)/LIBOPIE.PATCH
 
 MANIFEST: $(srcdir) Makefile.in
        @echo $(all) | tr "[ \t]" '\n' | sort | sed "s/\\./fetchmail-$(VERS)/" >MANIFEST
@@ -246,12 +246,5 @@ rpm: dist
        cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/fetchmail-$(VERS)*.rpm $(srcdir)
        cp $(RPMROOT)/SRPMS/fetchmail-$(VERS)*.src.rpm $(srcdir)
 
-# The automatically generated dependencies below may omit config.h
-# because it is included with ``#include <config.h>'' rather than
-# ``#include "config.h"''.  So we add the explicit dependency to make sure.
-$(objs): config.h
-
-rcfile_l.o: rcfile_y.h
-
 # Automatically generated dependencies will be put at the end of the makefile.
-# DO NOT DELETE THIS LINE -- make depend depends on it.
+# DO NOT DELETE THIS LINE -- makedepend depends on it.