Apple-2gs-SW
/
gno
mirror of https://github.com/GnoConsortium/gno.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- eliminate the definition and use of the macros INCLUDE_GNO, INCLUDE_ORCA, 

and INCLUDE_GNO_ALT.  The directories specified in 13/orcacdefs/defaults.h
  are now assumed to be correct.  When building lib/libc/stdio/vfprintf.o,
  these directories have to explicitly stated the makefile for the moment.
This commit is contained in:
gdr-ftp 1998-01-26 00:44:25 +00:00
parent f53219715c
commit 272fd7918a
2 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libc/stdio/Makefile
View File

@ -3,7 +3,7 @@
#
# Devin Reade, 1997
#
# $Id: Makefile,v 1.8 1997/11/01 19:16:29 gdr Exp $
# $Id: Makefile,v 1.9 1998/01/26 00:44:25 gdr-ftp Exp $
#
.INCLUDE: ../../../paths.mk
@ -32,7 +32,10 @@ obj: $(OBJS)
# We can avoid the problem by preprocessing this file with a stand-alone
# cpp(1). This problem has been reported to Byte Works.
#
JINCL = -I$(INCLUDE_GNO) -I$(INCLUDE_ORCA)
# It is *critical* that the directories specified here match those defined
# by the "path" pragma in 13/orcacdefs/defaults.h.
#
JINCL = -I/usr/include -I/lang/orca/libraries/orcacdefs
JDEFS = -D__ORCAC__ -D__appleiigs__ -D__GNO__ -DSPLIT_FILE_2
junk.c: vfprintf.c

23
paths.mk
View File

@ -7,7 +7,7 @@
#
# Devin Reade, 1997
#
# $Id: paths.mk,v 1.3 1997/11/01 19:10:37 gdr Exp $
# $Id: paths.mk,v 1.4 1998/01/26 00:44:20 gdr-ftp Exp $
#
# SRC_DIR is the top-level GNO source distribution directory (containing
@ -34,27 +34,6 @@ ORCA_DIST = /lang/orca
ORCA_SRC = /src/lib/orcalibs/Source
# INCLUDE_GNO is the directory containing only the header files (and subdirs
# containing header files) that will be shipped with GNO. Normally, this
# should be $(SRC_DIR)/gno/include
INCLUDE_GNO = $(SRC_DIR)/gno/include
# INCLUDE_ORCA is the directory containing the completely unmodified Orca/C
# header files. (The current version is v2.1.1b2.) If a file in here
# requires modifications, it should be copied into $(INCLUDE_GNO) and edited
# there. Presumably, INCLUDE_ORCA is $(ORCA_DIST)/libraries/orcacdefs.
INCLUDE_ORCA = $(ORCA_DIST)/libraries/orcacdefs
# INCLUDE_GNO_ALT is a directory residing on an HFS volume. It is used for
# those header files which have ProDOS-incompatible file names. These
# headers are actually "links" to the "real" headers, which reside in the
# $(INCLUDE_GNO) hierarchy.
# I recommend using /HFS-src/HFSinclude and defining /HFS-src in /etc/namespace.
INCLUDE_GNO_ALT = /HFS-src/HFSinclude
# These are the directories that will wind up becoming the distributions
# disks. We want to be able to ship on floppy, although the preferred
# method will be via ftp.