diff options
| -rw-r--r-- | libstore/ChangeLog | 4 | ||||
| -rw-r--r-- | libstore/Makefile | 4 | ||||
| -rw-r--r-- | serverboot/ChangeLog | 5 | ||||
| -rw-r--r-- | serverboot/Makefile | 8 |
4 files changed, 15 insertions, 6 deletions
diff --git a/libstore/ChangeLog b/libstore/ChangeLog index 9b946088..f5fbb09b 100644 --- a/libstore/ChangeLog +++ b/libstore/ChangeLog @@ -1,3 +1,7 @@ +2002-05-20 Ognyan Kulev <ogi@fmi.uni-sofia.bg> + + * Makefile: Move inclusion of ../Makeconf before using $(srcdir). + 2002-05-16 Roland McGrath <roland@frob.com> * device.c (enforced): Use dev_status_data_t for SIZES. diff --git a/libstore/Makefile b/libstore/Makefile index ca57b5be..f407ce61 100644 --- a/libstore/Makefile +++ b/libstore/Makefile @@ -54,12 +54,12 @@ BUNZIP2_OBJS = do-bunzip2.o OBJS = $(SRCS:.c=.o) $(GUNZIP_OBJS) $(BUNZIP2_OBJS) DIST_FILES = unzipstore.c +include ../Makeconf + # Look for zip stuff vpath %.c $(srcdir)/../exec CPPFLAGS += -I$(srcdir)/../exec -include ../Makeconf - module-CPPFLAGS = -D'STORE_SONAME_SUFFIX=".so.$(hurd-version)"' libstore_gunzip.so.$(hurd-version): $(GUNZIP_OBJS:.o=_pic.o) diff --git a/serverboot/ChangeLog b/serverboot/ChangeLog index 2026a1d4..6feacd03 100644 --- a/serverboot/ChangeLog +++ b/serverboot/ChangeLog @@ -1,3 +1,8 @@ +2002-05-20 Ognyan Kulev <ogi@fmi.uni-sofia.bg> + + * Makefile: Move inclusion of ../Makeconf before using $(srcdir) + and constrain vpath directives to avoid using ../exec/exec.o. + 2002-05-07 Roland McGrath <roland@frob.com> * default_pager.c (part_id): Add const to argument type. diff --git a/serverboot/Makefile b/serverboot/Makefile index 967ca33f..7f66f45a 100644 --- a/serverboot/Makefile +++ b/serverboot/Makefile @@ -19,7 +19,7 @@ dir := serverboot makemode := utility SRCS = bootstrap.c ffs_compat.c load.c wiring.c \ - ffs_file_io.c minix_ffs_compat.c file_io.c\ + ffs_file_io.c minix_ffs_compat.c file_io.c \ minix_file_io.c ext2_file_io.c strfcns.c exec.c \ panic.c elf-load.c gunzip.c bunzip2.c LCLHDRS = assert.h disk_inode_ffs.h fs.h queue.h defs.h \ @@ -35,18 +35,18 @@ OBJS = $(subst .c,.o,$(SRCS)) \ boot_script.o userland-boot.o \ $(UNZIP_OBJS) +include ../Makeconf + vpath boot_script.c $(srcdir)/../boot vpath userland-boot.c $(srcdir)/../boot # Look for zip stuff -VPATH += $(srcdir)/../exec +vpath %.c $(srcdir)/../exec # If SMALL_BZIP2 is defined, use relatively small memory. # It's crucial for serverboot, because swap is not enabled yet. CPPFLAGS += -I$(srcdir)/../exec -DGZIP -DBZIP2 -DSMALL_BZIP2 LDFLAGS += -static -include ../Makeconf - # Don't even bother. CFLAGS := $(filter-out -Wall,$(CFLAGS)) |