-# $Id: makefile,v 1.29 2001/05/02 03:18:03 rex Exp $
+# $Id: makefile,v 1.30 2001/06/15 11:15:32 ekohl Exp $
#
#
PATH_TO_TOP = ../../..
OBJECTS = blockdev.o close.o create.o dir.o dirwr.o iface.o string.o fat.o \
rw.o finfo.o volume.o shutdown.o cleanup.o fcb.o $(TARGET).coff
-LIBS = ../../../ntoskrnl/ntoskrnl.a
+
+LIBS = $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a
CFLAGS = -g -Wall -Werror
-all: $(TARGET).nostrip.sys $(TARGET).sys
+all: $(TARGET).sys.unstripped $(TARGET).sys
.phony: all
- $(RM) junk.tmp
- $(RM) base.tmp
- $(RM) temp.exp
+ - $(RM) $(TARGET).sym
- $(RM) $(TARGET).sys
+ - $(RM) $(TARGET).sys.unstripped
else
- - $(RM) $(OBJECTS) $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).nostrip.sys
+ - $(RM) $(OBJECTS) $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped
endif
.phony: clean
../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
-$(TARGET).nostrip.sys: $(OBJECTS) $(LIBS)
+
+$(TARGET).sys.unstripped: $(OBJECTS) $(LIBS)
$(LD) -r -o vfat.o $(OBJECTS)
$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext -Wl,--base-file,base.tmp -Wl,"-h vfatfs.sys" vfat.o $(LIBS)
- $(RM) junk.tmp
--output-exp temp.exp \
--def vfatfs.def
- $(RM) base.tmp
- $(CC) -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 -Wl,temp.exp -Wl,"-h vfatfs.sys" -specs=../../svc_specs -mdll -o $(TARGET).nostrip.sys vfat.o $(LIBS)
+ $(CC) -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 -Wl,temp.exp -Wl,"-h vfatfs.sys" -specs=../../svc_specs -mdll -o $(TARGET).sys.unstripped vfat.o $(LIBS)
- $(RM) temp.exp
+ $(NM) --numeric-sort $(TARGET).sys.unstripped >$(TARGET).sym
$(TARGET).sys: $(OBJECTS) $(LIBS)
-/* $Id: mmtypes.h,v 1.9 2000/07/07 10:30:54 dwelch Exp $ */
+/* $Id: mmtypes.h,v 1.10 2001/06/15 11:13:08 ekohl Exp $ */
#ifndef _INCLUDE_DDK_MMTYPES_H
#define _INCLUDE_DDK_MMTYPES_H
#include <ntos/mm.h>
#ifdef __NTOSKRNL__
-PVOID EXPORTED MmUserProbeAddress;
-PVOID EXPORTED MmHighestUserAddress;
+extern PVOID EXPORTED MmUserProbeAddress;
+extern PVOID EXPORTED MmHighestUserAddress;
#else
-PVOID IMPORTED MmUserProbeAddress;
-PVOID IMPORTED MmHighestUserAddress;
+extern PVOID IMPORTED MmUserProbeAddress;
+extern PVOID IMPORTED MmHighestUserAddress;
#endif
#ifdef __NTOSKRNL__
-/* $Id: volume.c,v 1.19 2001/06/11 19:54:05 ekohl Exp $
+/* $Id: volume.c,v 1.20 2001/06/15 11:14:06 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
sizeof(FILE_FS_LABEL_INFORMATION) +
LabelLength);
LabelInfo->VolumeLabelLength = LabelLength;
- wcscpy(&LabelInfo->VolumeLabel,
+ wcscpy(LabelInfo->VolumeLabel,
lpVolumeName);
hFile = CreateFileW(lpRootPathName,