diff -r a6f1f86a9e4d -r 328b71277613 Make.proto --- a/Make.proto Fri Feb 24 21:56:42 2017 +0100 +++ b/Make.proto Fri Feb 24 21:56:45 2017 +0100 @@ -50,7 +50,7 @@ # ********** OPTIONAL: MODIFY the next line *** # additional C-libraries that should be pre-linked with the class-objects LD_OBJ_LIBS= -LOCAL_SHARED_LIBS=$(LOCAL_SHARED_LIBS_LIBBASIC) +LOCAL_SHARED_LIBS= # ********** OPTIONAL: MODIFY the next line *** @@ -62,14 +62,14 @@ # for LINUX-32bit we need also librt.so, in order to resolve clock_gettime@GLIBC_2.2 (see linuxIntern.h) # for LINUX-64bit we need also librt.so, in order to resolve clock_gettime@GLIBC_2.2.5 (see linuxIntern.h) -ifneq (,$(findstring LINUX,$(CFLAGS))) +ifneq (,$(findstring LINUX,$(CFLAGS))) LOCAL_SHARED_LIBS=-lrt endif all:: preMake classLibRule postMake -pre_objs:: +pre_objs:: @@ -184,7 +184,6 @@ $(OUTDIR)Project.$(O) Project.$(C) Project.$(H): Project.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)ProjectDefinition.$(O) ProjectDefinition.$(C) ProjectDefinition.$(H): ProjectDefinition.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)ReadEvalPrintLoop.$(O) ReadEvalPrintLoop.$(C) ReadEvalPrintLoop.$(H): ReadEvalPrintLoop.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)RecursionLock.$(O) RecursionLock.$(C) RecursionLock.$(H): RecursionLock.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)Semaphore.$(O) Semaphore.$(C) Semaphore.$(H): Semaphore.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)SharedPool.$(O) SharedPool.$(C) SharedPool.$(H): SharedPool.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)Signal.$(O) Signal.$(C) Signal.$(H): Signal.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) @@ -232,6 +231,7 @@ $(OUTDIR)Process.$(O) Process.$(C) Process.$(H): Process.st $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)QuerySignal.$(O) QuerySignal.$(C) QuerySignal.$(H): QuerySignal.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Signal.$(H) $(STCHDR) $(OUTDIR)Rectangle.$(O) Rectangle.$(C) Rectangle.$(H): Rectangle.st $(INCLUDE_TOP)/stx/libbasic/Geometric.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)RecursionLock.$(O) RecursionLock.$(C) RecursionLock.$(H): RecursionLock.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Semaphore.$(H) $(STCHDR) $(OUTDIR)SequenceableCollection.$(O) SequenceableCollection.$(C) SequenceableCollection.$(H): SequenceableCollection.st $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)Set.$(O) Set.$(C) Set.$(H): Set.st $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)SmalltalkChunkFileSourceReader.$(O) SmalltalkChunkFileSourceReader.$(C) SmalltalkChunkFileSourceReader.$(H): SmalltalkChunkFileSourceReader.st $(INCLUDE_TOP)/stx/libbasic/AbstractSourceFileReader.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) @@ -514,3 +514,4 @@ $(OUTDIR)OSXOperatingSystem.$(O) OSXOperatingSystem.$(C) OSXOperatingSystem.$(H): OSXOperatingSystem.st $(INCLUDE_TOP)/stx/libbasic/AbstractOperatingSystem.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/UnixOperatingSystem.$(H) $(STCHDR) # ENDMAKEDEPEND --- do not remove this line +