update for HEAD-2003050101

[reactos.git] / apps / utils / cabman / makefile

diff --git a/apps/utils/cabman/makefile b/apps/utils/cabman/makefile
index eda0930..52284cb 100644 (file)
--- a/apps/utils/cabman/makefile
+++ b/apps/utils/cabman/makefile
@@ -1,64 +1,26 @@
-#
-# Makefile for ReactOS Cabinet Manager
-#
-PATH_TO_TOP = ../../..
-
-#FIXME: why doesn't this work?
-#ZLIB_OBJECTS    = $(PATH_TO_TOP)/drivers/lib/zlib/zlib.a
-ZLIB_PATH = $(PATH_TO_TOP)/drivers/lib/zlib
+# $Id$
 
-ZLIB_OBJECTS    = $(ZLIB_PATH)/adler32.o $(ZLIB_PATH)/deflate.o \
-                  $(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
-CFLAGS                 += -O3 -I$(ZLIB_PATH)
+PATH_TO_TOP = ../../..
 
-CLEAN_FILES = *.o $(TARGET).exe $(TARGET).sym test.exe test.sym
+TARGET_TYPE = program
 
-all: $(PROGS)
+TARGET_APPTYPE = console
 
-clean: 
-       - $(RM) $(CLEAN_FILES)
+TARGET_NAME = cabman
 
-.phony: clean 
+TARGET_OBJECTS = cabinet.o mszip.o raw.o  main.o dfp.o
 
-install: $(PROGS:%=$(FLOPPY_DIR)/apps/%)
+TARGET_SDKLIBS = zlib.a
 
-$(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-       $(CP) $* $(FLOPPY_DIR)\apps\$*
-else
-       $(CP) $* $(FLOPPY_DIR)/apps/$*
-endif
+TARGET_CFLAGS = -I$(PATH_TO_TOP)/lib/zlib
 
-dist: $(PROGS:%=../../$(DIST_DIR)/apps/%)
+TARGET_CPPFLAGS = $(TARGET_CFLAGS)
 
-$(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-       $(CP) $* ..\..\$(DIST_DIR)\apps\$*
-else
-       $(CP) $* ../../$(DIST_DIR)/apps/$*
-endif
+TARGET_GCCLIBS = stdc++
 
-#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_NORC = yes
 
-$(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 $(PATH_TO_TOP)/rules.mak
 
-include ../../../rules.mak
+include $(TOOLS_PATH)/helper.mk