Executables now depend on libobjects.a, not @LIBOBJECTS_A_OR_SO@.

(LIBS): Don't look in $(srcdir) for library.
(OBJECTS_NEXT_INCLUDES): Don't look in non-existant next-includes dir.
(copy-dist): Don't use $(srcdir).
(Makefile): Likewise.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@681 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mccallum 1996-01-05 22:07:03 +00:00
parent a55d5aa13b
commit c83aea25f6

View file

@ -1,6 +1,6 @@
#
# Examples makefile for Objective-C Class Library
# Copyright (C) 1993, 1995 Free Software Foundation, Inc.
# Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc.
#
# Written by: R. Andrew McCallum <mccallum@cs.rochester.edu>
# Dept. of Computer Science, U. of Rochester, Rochester, NY 14627
@ -35,7 +35,7 @@ CPPFLAGS =
LDFLAGS =
DEFS = @DEFS@
LIBS = -L$(srcdir)/../src -lobjects @LIBOBJC@ @LIBS@
LIBS = -L../src -lobjects @LIBOBJC@ @LIBS@
#### End of system configuration section. ####
@ -44,7 +44,7 @@ include $(srcdir)/../Version
# xxx Is this needed anymore?
NEXT_NEXT_INCLUDES = -I/usr/include
OBJECTS_NEXT_INCLUDES = -I$(srcdir)/../objects/next-include
OBJECTS_NEXT_INCLUDES = -I$(srcdir)/../src
NEXT_INCLUDES = @NEXT_INCLUDES@
ALL_CPPFLAGS = -I$(srcdir)/../src $(NEXT_INCLUDES) $(CPPFLAGS)
@ -79,29 +79,29 @@ EXCS = $(SRCS:.m=)
all: $(EXCS)
# This works for GNU make, but not others.
# %: %.o $(srcdir)/../src/@LIBOBJECTS_A_OR_SO@
# %: %.o $(srcdir)/../src/libobjects.a
# $(CC) $(ALL_CFLAGS) $< -o $@ $(ALL_LDFLAGS)
# How can I do this in a better way than the ugliness below?
# (but also have it work on old-style /bin/make)
LINK_CMD = $(CC) $(ALL_CFLAGS) $@.o -o $@ $(ALL_LDFLAGS)
dictionary: dictionary.o $(srcdir)/../src/@LIBOBJECTS_A_OR_SO@
dictionary: dictionary.o ../src/libobjects.a
$(LINK_CMD)
stdio-stream: stdio-stream.o $(srcdir)/../src/@LIBOBJECTS_A_OR_SO@
stdio-stream: stdio-stream.o ../src/libobjects.a
$(LINK_CMD)
textcoding: textcoding.o $(srcdir)/../src/@LIBOBJECTS_A_OR_SO@
textcoding: textcoding.o ../src/libobjects.a
$(LINK_CMD)
port-server: port-server.o $(srcdir)/../src/@LIBOBJECTS_A_OR_SO@
port-server: port-server.o ../src/libobjects.a
$(LINK_CMD)
port-client: port-client.o $(srcdir)/../src/@LIBOBJECTS_A_OR_SO@
port-client: port-client.o ../src/libobjects.a
$(LINK_CMD)
first-server: first-server.o $(srcdir)/../src/@LIBOBJECTS_A_OR_SO@
first-server: first-server.o ../src/libobjects.a
$(LINK_CMD)
first-client: first-client.o $(srcdir)/../src/@LIBOBJECTS_A_OR_SO@
first-client: first-client.o ../src/libobjects.a
$(LINK_CMD)
second-server: second-server.o $(srcdir)/../src/@LIBOBJECTS_A_OR_SO@
second-server: second-server.o ../src/libobjects.a
$(LINK_CMD)
second-client: second-client.o $(srcdir)/../src/@LIBOBJECTS_A_OR_SO@
second-client: second-client.o ../src/libobjects.a
$(LINK_CMD)
first: first-server first-client
@ -130,8 +130,8 @@ realclean: distclean
rm -f TAGS
copy-dist: $(DIST_FILES)
mkdir $(srcdir)/../snap/examples
ln $(DIST_FILES) $(srcdir)/../snap/examples
mkdir ../snap/examples
ln $(DIST_FILES) ../snap/examples
Makefile: Makefile.in
cd $(srcdir)/..; $(SHELL) config.status
cd ..; $(SHELL) config.status