- the build system now handles static libraries 0.5% better

- cabman: brand new makefile - uses TARGET_* macros, the build helper, and the zlib library properly
 - fmifs: static libraries (.a archives) are built directly into the dk/w32/lib directory, instead of their base directory, so the makefile has been fixed
 - psapi: split into PSAPI.dll and EPSAPI (Extended PSAPI), renamed some files, new header
 - zlib: cleaned up makefile from unnecessary hacks

svn path=/trunk/; revision=4528

reactos/Makefile

@@ -34,7 +34,7 @@ LIB_FSLIB = vfatlib
 # advapi32 crtdll fmifs gdi32 kernel32 libpcap packet msafd msvcrt ntdll ole32
 # oleaut32 psapi rpcrt4 secur32 shell32 user32 version ws2help ws2_32 wsock32 wshirda
 DLLS = advapi32 crtdll fmifs freetype gdi32 kernel32 packet msafd msvcrt ntdll \
-       secur32 user32 version winedbgc ws2help ws2_32 wshirda zlib #winmm 
+       secur32 user32 version winedbgc ws2help ws2_32 wshirda zlib epsapi #winmm
 
 SUBSYS = smss win32k csrss ntvdm
 

reactos/apps/utils/cabman/main.cpp

@@ -474,7 +474,7 @@ VOID CCABManager::OnAdd(PCFFILE File,
 }
 
 
-INT main(INT argc, PCHAR argv[])
+int main(int argc, char * argv[])
 /*
  * FUNCTION: Main entry point
  * ARGUMENTS:

reactos/apps/utils/cabman/makefile

@@ -1,64 +1,26 @@
-#
+# $Id: makefile,v 1.8 2003/04/13 03:24:26 hyperion Exp $
-# Makefile for ReactOS Cabinet Manager
+
-#
 PATH_TO_TOP = ../../..
 
-#FIXME: why doesn't this work?
+TARGET_TYPE = program
-#ZLIB_OBJECTS    = $(PATH_TO_TOP)/drivers/lib/zlib/zlib.a
-ZLIB_PATH = $(PATH_TO_TOP)/drivers/lib/zlib
 
-ZLIB_OBJECTS    = $(ZLIB_PATH)/adler32.o $(ZLIB_PATH)/deflate.o \
+TARGET_APPTYPE = console
-                  $(ZLIB_PATH)/infblock.o $(ZLIB_PATH)/infcodes.o \
-                  $(ZLIB_PATH)/inflate.o $(ZLIB_PATH)/inftrees.o \
-                  $(ZLIB_PATH)/infutil.o $(ZLIB_PATH)/inffast.o \
-                  $(ZLIB_PATH)/trees.o $(ZLIB_PATH)/zutil.o
-ENGINE_OBJECTS  = $(ZLIB_OBJECTS) cabinet.o mszip.o raw.o
-TEST_OBJECTS    = $(ENGINE_OBJECTS) test.o
-OBJECTS         = $(ENGINE_OBJECTS) main.o dfp.o
-TARGET          = cabman
-PROGS           = $(TARGET).exe test.exe
 
-#FIXME: zlib should be compiled and installed in the SDK by the master makefile
+TARGET_NAME = cabman
-CFLAGS 		+= -O3 -I$(ZLIB_PATH)
 
-CLEAN_FILES = *.o $(TARGET).exe $(TARGET).sym test.exe test.sym
+TARGET_OBJECTS = cabinet.o mszip.o raw.o  main.o dfp.o
 
-all: $(PROGS)
+TARGET_SDKLIBS = zlib.a
 
-clean: 
+TARGET_CFLAGS = -I$(PATH_TO_TOP)/lib/zlib
-	- $(RM) $(CLEAN_FILES)
 
-.phony: clean 
+TARGET_CPPFLAGS = $(TARGET_CFLAGS)
 
-install: $(PROGS:%=$(FLOPPY_DIR)/apps/%)
+TARGET_GCCLIBS = stdc++
 
-$(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
+TARGET_NORC = yes
-ifeq ($(DOSCLI),yes)
-	$(CP) $* $(FLOPPY_DIR)\apps\$*
-else
-	$(CP) $* $(FLOPPY_DIR)/apps/$*
-endif
 
-dist: $(PROGS:%=../../$(DIST_DIR)/apps/%)
+include $(PATH_TO_TOP)/rules.mak
 
-$(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
+include $(TOOLS_PATH)/helper.mk
-ifeq ($(DOSCLI),yes)
-	$(CP) $* ..\..\$(DIST_DIR)\apps\$*
-else
-	$(CP) $* ../../$(DIST_DIR)/apps/$*
-endif
-
-#FIXME: zlib should be compiled and installed in the SDK by the master makefile
-$(ZLIB_PATH)/zlib.a:
-	$(MAKE) -C $(ZLIB_PATH) -f makefile.reactos
-
-$(TARGET).exe: $(OBJECTS) $(ZLIB_PATH)/zlib.a
-	$(CC) $(OBJECTS) -lstdc++ -o $(TARGET).exe
-	$(NM) --numeric-sort $(TARGET).exe > $(TARGET).sym
-	
-test.exe: $(TEST_OBJECTS)
-	$(CC) $(TEST_OBJECTS) -lstdc++ -o test.exe
-	$(NM) --numeric-sort test.exe > test.sym
-
-include ../../../rules.mak
 

reactos/include/epsapi.h

@@ -1,4 +1,4 @@
-/* $Id: psapi.h,v 1.5 2003/04/03 00:06:24 hyperion Exp $
+/* $Id: epsapi.h,v 1.1 2003/04/13 03:24:27 hyperion Exp $
 */
 /*
  * internal/psapi.h

reactos/lib/epsapi/enum/drivers.c

@@ -1,21 +1,24 @@
-/* $Id: drivers.c,v 1.1 2003/04/03 00:06:23 hyperion Exp $
+/* $Id: drivers.c,v 1.1 2003/04/13 03:24:27 hyperion Exp $
 */
 /*
  * COPYRIGHT:   See COPYING in the top level directory
  * LICENSE:     See LGPL.txt in the top level directory
  * PROJECT:     ReactOS system libraries
- * FILE:        reactos/lib/psapi/enum/drivers.c
+ * FILE:        reactos/lib/epsapi/enum/drivers.c
  * PURPOSE:     Enumerate system modules
  * PROGRAMMER:  KJK::Hyperion <noog@libero.it>
  * UPDATE HISTORY:
  *              02/04/2003: Created
+ *              12/04/2003: internal PSAPI renamed EPSAPI (Extended PSAPI) and
+ *                          isolated in its own library to clear the confusion
+ *                          and improve reusability
  */
 
 #include <ddk/ntddk.h>
 #include <debug.h>
 #include <stddef.h>
 
-#include "internal/psapi.h"
+#include <epsapi.h>
 
 NTSTATUS
 NTAPI

reactos/lib/epsapi/enum/modules.c

@@ -1,10 +1,10 @@
-/* $Id: module.c,v 1.5 2003/04/03 00:06:23 hyperion Exp $
+/* $Id: modules.c,v 1.1 2003/04/13 03:24:27 hyperion Exp $
 */
 /*
  * COPYRIGHT:   See COPYING in the top level directory
  * LICENSE:     See LGPL.txt in the top level directory
  * PROJECT:     ReactOS system libraries
- * FILE:        reactos/lib/psapi/enum/module.c
+ * FILE:        reactos/lib/epsapi/enum/module.c
  * PURPOSE:     Enumerate process modules
  * PROGRAMMER:  KJK::Hyperion <noog@libero.it>
  * UPDATE HISTORY:
@@ -14,13 +14,17 @@
  *              12/02/2003: malloc and free renamed to PsaiMalloc and PsaiFree,
  *                          for better reusability
  *              02/04/2003: System modules enumeration moved into its own file
+ *              12/04/2003: internal PSAPI renamed EPSAPI (Extended PSAPI) and
+ *                          isolated in its own library to clear the confusion
+ *                          and improve reusability
  */
 
 #include <ddk/ntddk.h>
 #include <debug.h>
-#include <internal/psapi.h>
 #include <ntdll/ldr.h>
 
+#include <epsapi.h>
+
 NTSTATUS
 NTAPI
 PsaEnumerateProcessModules

reactos/lib/epsapi/enum/processes.c

@@ -1,10 +1,10 @@
-/* $Id: process.c,v 1.6 2003/04/04 20:35:24 hyperion Exp $
+/* $Id: processes.c,v 1.1 2003/04/13 03:24:27 hyperion Exp $
 */
 /*
  * COPYRIGHT:   See COPYING in the top level directory
  * LICENSE:     See LGPL.txt in the top level directory
  * PROJECT:     ReactOS system libraries
- * FILE:        reactos/lib/psapi/enum/process.c
+ * FILE:        reactos/lib/epsapi/enum/processes.c
  * PURPOSE:     Enumerate processes and threads
  * PROGRAMMER:  KJK::Hyperion <noog@libero.it>
  * UPDATE HISTORY:
@@ -26,13 +26,16 @@
  *                           - PsaEnumerateProcessesAndThreads
  *                           - PsaEnumerateProcesses
  *                           - PsaEnumerateThreads
+ *              12/04/2003: internal PSAPI renamed EPSAPI (Extended PSAPI) and
+ *                          isolated in its own library to clear the confusion
+ *                          and improve reusability
  */
 
 #include <ddk/ntddk.h>
 #include <debug.h>
 #include <stddef.h>
 
-#include "internal/psapi.h"
+#include <epsapi.h>
 
 NTSTATUS
 NTAPI

reactos/lib/epsapi/makefile

@@ -0,0 +1,18 @@
+# $Id: makefile,v 1.1 2003/04/13 03:24:27 hyperion Exp $
+
+PATH_TO_TOP = ../..
+
+TARGET_TYPE = library
+
+TARGET_NAME = epsapi
+
+TARGET_OBJECTS = \
+ enum/drivers.o \
+ enum/modules.o \
+ enum/processes.o 
+ 
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+# EOF

reactos/lib/fmifs/makefile

@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.16 2003/04/05 23:17:21 chorns Exp $
+# $Id: makefile,v 1.17 2003/04/13 03:24:26 hyperion Exp $
 
 PATH_TO_TOP = ../..
 
@@ -12,9 +12,7 @@ TARGET_CFLAGS = -fno-builtin
 
 TARGET_LFLAGS = -nostdlib -nostartfiles
 
-TARGET_SDKLIBS = ntdll.a kernel32.a
+TARGET_SDKLIBS = vfatlib.a ntdll.a kernel32.a
-
-TARGET_LIBS = $(PATH_TO_TOP)/lib/fslib/vfatlib/vfatlib.a
 
 TARGET_OBJECTS = \
   chkdsk.o \

reactos/lib/psapi/makefile

@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.5 2003/04/03 00:06:24 hyperion Exp $
+# $Id: makefile,v 1.6 2003/04/13 03:24:26 hyperion Exp $
 
 PATH_TO_TOP = ../..
 
@@ -6,9 +6,9 @@ TARGET_TYPE = dynlink
 
 TARGET_NAME = psapi
 
-TARGET_SDKLIBS = ntdll.a kernel32.a
+TARGET_SDKLIBS = epsapi.a ntdll.a kernel32.a
 
-TARGET_CFLAGS = -I./include -Wall
+TARGET_CFLAGS = -I./include
 
 TARGET_LFLAGS = -nostartfiles -nostdlib
 
@@ -18,12 +18,10 @@ TARGET_OBJECTS = \
 	misc/dllmain.o \
 	misc/malloc.o \
 	misc/stubs.o \
-	misc/win32.o \
+	misc/win32.o
-	enum/module.o \
-	enum/process.o \
-	enum/drivers.o
 	
 include $(PATH_TO_TOP)/rules.mak
+
 include $(TOOLS_PATH)/helper.mk
 
 # EOF

reactos/lib/psapi/misc/win32.c

@@ -1,4 +1,4 @@
-/* $Id: win32.c,v 1.7 2003/04/03 00:06:24 hyperion Exp $
+/* $Id: win32.c,v 1.8 2003/04/13 03:24:26 hyperion Exp $
  */
 /*
  * COPYRIGHT:   See COPYING in the top level directory
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ddk/ntddk.h>
-#include <internal/psapi.h>
+#include <epsapi.h>
 
 /* EmptyWorkingSet */
 BOOL STDCALL EmptyWorkingSet(HANDLE hProcess)

reactos/lib/zlib/Makefile

@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2003/04/05 19:40:41 chorns Exp $
+# $Id: Makefile,v 1.3 2003/04/13 03:24:26 hyperion Exp $
 
 PATH_TO_TOP = ../..
 
@@ -6,8 +6,6 @@ TARGET_TYPE = library
 
 TARGET_NAME = zlib
 
-TARGET_NORC = yes
-
 TARGET_CFLAGS = \
  -MMD -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
  -Wstrict-prototypes -Wmissing-prototypes
@@ -20,7 +18,4 @@ include $(PATH_TO_TOP)/rules.mak
 
 include $(TOOLS_PATH)/helper.mk
 
-zlib.sym:
-	@echo FIXME!>$@
-
 # EOF

reactos/tools/helper.mk

@@ -1,4 +1,4 @@
-# $Id: helper.mk,v 1.32 2003/04/05 23:17:22 chorns Exp $
+# $Id: helper.mk,v 1.33 2003/04/13 03:24:26 hyperion Exp $
 #
 # Helper makefile for ReactOS modules
 # Variables this makefile accepts:
@@ -509,7 +509,12 @@ TARGET_NFLAGS += $(MK_NFLAGS)
 
 MK_GCCLIBS := $(addprefix -l, $(TARGET_GCCLIBS))
 
-MK_FULLNAME := $(MK_BASENAME)$(MK_EXT)
+ifeq ($(MK_MODE),static)
+  MK_FULLNAME := $(SDK_PATH_LIB)/$(MK_BASENAME)$(MK_EXT)
+else
+  MK_FULLNAME := $(MK_BASENAME)$(MK_EXT)
+endif
+
 MK_IMPLIB_FULLNAME := $(MK_BASENAME)$(MK_IMPLIB_EXT)
 
 MK_NOSTRIPNAME := $(MK_BASENAME).nostrip$(MK_EXT)