Both core and memdisk wants to use the gen-id stuff, so let it.
# official release. Otherwise, substitute a hex string that is pretty much
# guaranteed to be unique to be unique from build to build.
ifndef HEXDATE
-HEXDATE := $(shell $(PERL) now.pl $(SRCS))
+HEXDATE := $(shell $(PERL) ../now.pl $(SRCS))
endif
ifndef DATE
-DATE := $(shell sh gen-id.sh $(HEXDATE))
+DATE := $(shell sh ../gen-id.sh $(HEXDATE))
endif
all: $(BTARGET)
;
; Version number definitinons
;
-%ifndef DEPEND ; Generated file
%include "../version.gen"
-%endif
;
; Copyright year...
OBJCOPY = objcopy
PERL = perl
+SRCS = $(wildcard *.asm *.c *.h)
+
+# The DATE is set on the make command line when building binaries for
+# official release. Otherwise, substitute a hex string that is pretty much
+# guaranteed to be unique to be unique from build to build.
+ifndef HEXDATE
+HEXDATE := $(shell $(PERL) ../now.pl $(SRCS))
+endif
+ifndef DATE
+DATE := $(shell sh ../gen-id.sh $(HEXDATE))
+endif
+
# Important: init.o16 must be first!!
OBJS16 = init.o16 init32.o
OBJS32 = start32.o setup.o msetup.o e820func.o conio.o memcpy.o memset.o \
;; com32.inc in the main SYSLINUX distribution.
;;
+%include '../version.gen'
+
MY_CS equ 0x0800 ; Segment address to use
CS_BASE equ (MY_CS << 4) ; Corresponding address
section .rodata
memdisk_version:
- db "MEMDISK ", VERSION, " ", DATE, 0
+ db "MEMDISK ", VERSION_STR, " ", DATE, 0
;; -----------------------------------------------------------------------
;; End kernel image header