summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/config/ChangeLog8
-rw-r--r--src/config/win-post.in45
-rw-r--r--src/config/windows.in8
3 files changed, 53 insertions, 8 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 861fc3613..2ec3d0a95 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,11 @@
+Tue Oct 10 21:42:14 1995 Theodore Y. Ts'o <tytso@dcl>
+
+ * win-post.in: New file
+
+ * windows.in: Moved .c -> .obj rule to win-post.in, since we need
+ it after the LIBNAME makefile variable is defined in the
+ main body of the Makefile.
+
Wed Sep 27 00:51:51 1995 Theodore Y. Ts'o <tytso@dcl>
* winexclude.sed: New file, used for generating DOS zip files.
diff --git a/src/config/win-post.in b/src/config/win-post.in
new file mode 100644
index 000000000..c06f91b27
--- /dev/null
+++ b/src/config/win-post.in
@@ -0,0 +1,45 @@
+# config/post.in
+# put all:: first just in case no other rules occur here
+#
+all::
+
+.c.obj:
+ $(CC) $(CFLAGS) /c $*.c
+!if defined(LIBNAME)
+!if "$(LIBCMD)"!="rem"
+ $(LIBCMD) /nologo $(LIBNAME) -+$@;
+!endif
+!endif
+
+check::
+check-windows::
+
+.depend: $(SRCS) $(SRCTOP)/util/depfix.sed
+ if test -n "$(SRCS)" ; then \
+ $(CC) -M $(CFLAGS) $(SRCS) | \
+ sed -f $(SRCTOP)/util/depfix.sed | \
+ sed -e 's; $(SRCTOP)/; $$(SRCTOP)/;g' | \
+ sed -e 's; $(srcdir)/; $$(srcdir)/;g' | \
+ sed -e 's; $(BUILDTOP)/; $$(BUILDTOP)/;g' | \
+ sed -e 's; \./; ;g' > .depend; \
+ else :; fi
+
+depend:: .depend
+ if test -n "$(SRCS)" ; then \
+ sed -e '/^# +++ Dependency line eater +++/,$$d' \
+ < $(srcdir)/Makefile.in | cat - .depend \
+ > $(srcdir)/Makefile.in.new; \
+ $(MV) $(srcdir)/Makefile.in $(srcdir)/Makefile.in.old; \
+ $(MV) $(srcdir)/Makefile.in.new $(srcdir)/Makefile.in; \
+ else :; fi
+
+clean:: clean-$(WHAT)
+ $(RM) config.log pre.out post.out Makefile.out
+
+clean-unix::
+ if test -n "$(OBJS)" ; then $(RM) $(OBJS); else :; fi
+ $(RM) .depend
+
+clean-windows::
+ $(RM) *.$(OBJEXT)
+ $(RM) msvc.pdb *.err
diff --git a/src/config/windows.in b/src/config/windows.in
index 30dd6817e..8717c22fa 100644
--- a/src/config/windows.in
+++ b/src/config/windows.in
@@ -69,14 +69,6 @@ EXEEXT=.exe
MFLAGS=$(MAKEFLAGS)
-.c.obj:
- $(CC) $(CFLAGS) /c $*.c
-!if defined(LIBNAME)
-!if "$(LIBCMD)"!="rem"
- $(LIBCMD) /nologo $(LIBNAME) -+$@;
-!endif
-!endif
-
#
# End of Microsoft Windows config lines
#