Skip to content

Commit

Permalink
Fix 'cord' headers path in EMX_MAKEFILE and README.QUICK
Browse files Browse the repository at this point in the history
* EMX_MAKEFILE (CORD_INCLUDE_FILES): Replace cord/*.h files with
include/*.h ones (all "cord" header files moved in gc4.8).
* EMX_MAKEFILE (cords): Do not copy cord/*.h files to "include"
folder.
* README.QUICK: Replace cord/cord.h with include/cord.h; move sentence
about cord.h to the relevant paragraph.
  • Loading branch information
ivmai committed Jun 21, 2014
1 parent c477175 commit 885dfa8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
7 changes: 2 additions & 5 deletions EMX_MAKEFILE
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers

CORD_OBJS= cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o

CORD_INCLUDE_FILES= $(srcdir)/gc.h $(srcdir)/cord/cord.h $(srcdir)/cord/ec.h \
$(srcdir)/cord/cord_pos.h
CORD_INCLUDE_FILES= $(srcdir)/gc.h $(srcdir)/include/cord.h \
$(srcdir)/include/ec.h $(srcdir)/include/cord_pos.h

# Libraries needed for curses applications. Only needed for de.
CURSES= -lcurses -ltermlib
Expand Down Expand Up @@ -67,9 +67,6 @@ gc.a: $(OBJS)
cords: $(CORD_OBJS) cord/cordtest.exe
$(AR) ru gc.a $(CORD_OBJS)
$(RANLIB) gc.a
cp $(srcdir)/cord/cord.h include/cord.h
cp $(srcdir)/cord/ec.h include/ec.h
cp $(srcdir)/cord/cord_pos.h include/cord_pos.h

gc_cpp.o: $(srcdir)/gc_cpp.cc $(srcdir)/gc_cpp.h
$(CXX) -c -O $(srcdir)/gc_cpp.cc
Expand Down
6 changes: 3 additions & 3 deletions README.QUICK
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ Makefile.direct, type "make cords", after copying to "Makefile".
(This requires an ANSI C compiler. You may
need to redefine CC in the Makefile. The CORD_printf implementation in
cordprnt.c is known to be less than perfectly portable. The rest of the
package should still work.)
package should still work.) See include/cord.h for the API.

If you wish to use the collector from C++, type "make c++", or use
--enable-cplusplus with the configure script. With Makefile.direct,
these ones add further files to gc.a and to the include subdirectory.
With the alternate build process,this generates libgccpp.
See cord/cord.h and include/gc_cpp.h.
With the alternate build process, this generates libgccpp.
See include/gc_cpp.h.

TYPICAL USE:
Include "gc.h" from the include subdirectory. Link against the
Expand Down

0 comments on commit 885dfa8

Please sign in to comment.