From ef773a3f6bc5b977e532e99d335db14e6c262d09 Mon Sep 17 00:00:00 2001 From: Emanuele Aliberti Date: Tue, 1 Oct 2002 20:21:45 +0000 Subject: [PATCH 1/1] PSX: minor changes to the 'posix' module for enabling full compilation. Q: should the dk for a subsystem be contained in that subsystem's tree? svn path=/trunk/; revision=3595 --- posix/Makefile | 5 ++++- posix/apps/baresh/Makefile | 4 ++-- posix/lib/Makefile | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 posix/lib/Makefile diff --git a/posix/Makefile b/posix/Makefile index f5d138721c3..ba6da7e2e8d 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 2002/08/23 12:40:56 ea Exp $ +# $Id: Makefile,v 1.4 2002/10/01 20:21:44 ea Exp $ # # ReactOS POSIX+ Personality # @@ -8,6 +8,7 @@ CFLAGS=-Iinclude all: lib/crt0w32.o make -C tools + make -C lib make -C server make -C lib/psxdll make -C lib/psxx @@ -17,6 +18,7 @@ all: lib/crt0w32.o lib/crt0w32.o: lib/crt0w32.c clean: + make -C lib clean make -C tools clean make -C server clean make -C lib/psxdll clean @@ -25,6 +27,7 @@ clean: make -C apps/posixw32 clean - $(RM) lib/crt0w32.o + include $(PATH_TO_TOP)/rules.mak # EOF diff --git a/posix/apps/baresh/Makefile b/posix/apps/baresh/Makefile index 7c9dbebc231..e0273a94a69 100644 --- a/posix/apps/baresh/Makefile +++ b/posix/apps/baresh/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 2002/08/23 12:40:56 ea Exp $ +# $Id: Makefile,v 1.5 2002/10/01 20:21:45 ea Exp $ # # Tu run it in Win32 console mode, undefine __SUBSYSTEM_WINDOWS__ # and pass "console" in the ld's --subsystem option. @@ -16,7 +16,7 @@ OBJECTS=$(TARGET_NAME).o $(TARGET_NAME).coff LIBRARIES=\ $(PATH_TO_PSX_TOP)/lib/crt0w32.o \ - $(PATH_TO_TOP)/dk/psx/lib/psxdll.a + $(PATH_TO_PSX_TOP)/lib/psxdll/psxdll.a $(TARGET_NAME): $(OBJECTS) $(LIBRARIES) $(CC) \ diff --git a/posix/lib/Makefile b/posix/lib/Makefile new file mode 100644 index 00000000000..7a2d21cb0e4 --- /dev/null +++ b/posix/lib/Makefile @@ -0,0 +1,17 @@ +# $Id: Makefile,v 1.1 2002/10/01 20:21:45 ea Exp $ +# posix/lib/Makefile +# +PATH_TO_TOP=../../reactos + +PATH_TO_PSX_TOP = ../.. + +all: + make -C psxdll psxdll.a + make -C psxx psxx.a + +clean: + - $(RM) *.a + +include $(PATH_TO_TOP)/rules.mak + +# EOF -- 2.17.1