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

diff --git a/posix/Makefile b/posix/Makefile
index f5d1387..ba6da7e 100644 (file)
--- 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
 #
 #
 # ReactOS POSIX+ Personality
 #


@@ -8,6 +8,7 @@ CFLAGS=-Iinclude
 
 all: lib/crt0w32.o
        make -C tools
 
 all: lib/crt0w32.o
        make -C tools

+       make -C lib

        make -C server
        make -C lib/psxdll
        make -C lib/psxx
        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:
 lib/crt0w32.o: lib/crt0w32.c
 
 clean:

+       make -C lib clean

        make -C tools clean
        make -C server clean
        make -C lib/psxdll 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
 
        make -C apps/posixw32 clean
        - $(RM) lib/crt0w32.o
 

+

 include $(PATH_TO_TOP)/rules.mak
 
 # EOF
 include $(PATH_TO_TOP)/rules.mak
 
 # EOF

diff --git a/posix/apps/baresh/Makefile b/posix/apps/baresh/Makefile
index 7c9dbeb..e0273a9 100644 (file)
--- 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.
 #
 # 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 \
 
 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) \
 
 $(TARGET_NAME): $(OBJECTS) $(LIBRARIES)
        $(CC) \

diff --git a/posix/lib/Makefile b/posix/lib/Makefile
new file mode 100644 (file)
index 0000000..7a2d21c
--- /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