Changeset 1340 in kBuild

Timestamp:

Dec 2, 2007 10:07:40 PM (17 years ago)

Author:

bird

Message:

Made bootstrap work. (kmk_redirect + version.c clash)

Location:

trunk/src/kmk

Files:

• Makefile.am (modified) (5 diffs)
• Makefile.kmk (modified) (1 diff)
• kmkbuiltin/kbuild_version.c (moved) (moved from trunk/src/kmk/kmkbuiltin/version.c )

trunk/src/kmk/Makefile.am

@@ -33 +33 @@
 SUBDIRS =       glob config $(MAYBE_W32)
 
-bin_PROGRAMS =  kmk
+bin_PROGRAMS =  kmk kmk_redirect
 
 if USE_CUSTOMS
@@ -49 +49 @@
                 kbuild.c \
                 electric.c \
-        ../lib/md5.c \
-        ../lib/kDep.c \
+                ../lib/md5.c \
+                ../lib/kDep.c \
                 \
                 kmkbuiltin.c \
@@ -69 +69 @@
                 kmkbuiltin/rm.c \
                 kmkbuiltin/rmdir.c \
+                kmkbuiltin/test.c \
                 kmkbuiltin/err.c \
                 kmkbuiltin/setmode.c \
@@ -74 +75 @@
                 kmkbuiltin/strlcpy.c \
                 kmkbuiltin/osdep.c \
-                kmkbuiltin/version.c
-
-## TODO kmk_redirect.
+                kmkbuiltin/kbuild_version.c
+
+kmk_redirect_SOURCES = kmkbuiltin/redirect.c
 
 EXTRA_kmk_SOURCES = vmsjobs.c remote-stub.c remote-cstms.c
@@ -135 +136 @@
     @DEFS@
 
-AM_CPPFLAGS =   $(GLOBINC)
+AM_CPPFLAGS =   $(GLOBINC) -I$(srcdir)/../lib
 # Only process if target is MS-Windows
 if WINDOWSENV

trunk/src/kmk/Makefile.kmk

@@ -50 +50 @@
         kmkbuiltin/setmode.c \
         kmkbuiltin/strmode.c \
-        kmkbuiltin/version.c \
+        kmkbuiltin/kbuild_version.c \
         getopt.c \
         getopt1.c \