corrected makefiles following suggestion by MBN
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -12,28 +12,20 @@
|
|||||||
top_srcdir = @top_srcdir@/..
|
top_srcdir = @top_srcdir@/..
|
||||||
top_builddir = ../..
|
top_builddir = ../..
|
||||||
program_dir = samples/ipc
|
program_dir = samples/ipc
|
||||||
# the comment at the end of the next line is needed because otherwise autoconf
|
|
||||||
# would remove this line completely - it contains a built-in hack to remove
|
|
||||||
# any VPATH assignment not containing ':'
|
|
||||||
VPATH = @PATH_IFS@$(top_srcdir)/samples/ipc # ':' for autoconf
|
|
||||||
|
|
||||||
# Clears all default suffixes
|
OBJECTS =$(PROGRAM).o
|
||||||
.SUFFIXES: .o .cpp .c .cxx
|
DEPFILES=$(PROGRAM).d
|
||||||
|
|
||||||
.cpp.o :
|
# this target can't be called all
|
||||||
$(CXX) -c $(CXXFLAGS) -o $@ $<
|
all-both:
|
||||||
|
$(MAKE) PROGRAM=client all
|
||||||
|
$(MAKE) PROGRAM=server all
|
||||||
|
|
||||||
# Set defaults from configure
|
# this target can't be called clean
|
||||||
include ../../src/make.env
|
clean-both:
|
||||||
|
$(MAKE) PROGRAM=client clean
|
||||||
|
$(MAKE) PROGRAM=server clean
|
||||||
|
|
||||||
all: client server
|
include ../../src/makeprog.env
|
||||||
|
|
||||||
client: client.o ../../lib/@WX_TARGET_LIBRARY@
|
|
||||||
$(CXX) $(LDFLAGS) -o client client.o $(LDLIBS)
|
|
||||||
|
|
||||||
server: server.o ../../lib/@WX_TARGET_LIBRARY@
|
|
||||||
$(CXX) $(LDFLAGS) -o server server.o $(LDLIBS)
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f $(OBJECTS) $(PROGRAM) core
|
|
||||||
|
|
||||||
|
-include $(DEPFILES)
|
||||||
|
@@ -13,15 +13,19 @@ top_srcdir = @top_srcdir@/..
|
|||||||
top_builddir = ../..
|
top_builddir = ../..
|
||||||
program_dir = samples/sockets
|
program_dir = samples/sockets
|
||||||
|
|
||||||
# PROGRAM=minimal
|
|
||||||
|
|
||||||
OBJECTS =$(PROGRAM).o
|
OBJECTS =$(PROGRAM).o
|
||||||
DEPFILES=$(PROGRAM).d
|
DEPFILES=$(PROGRAM).d
|
||||||
|
|
||||||
# this can't be called all
|
# this target can't be called all
|
||||||
dummy:
|
all-both:
|
||||||
$(MAKE) PROGRAM=client all
|
$(MAKE) PROGRAM=client all
|
||||||
$(MAKE) PROGRAM=server all
|
$(MAKE) PROGRAM=server all
|
||||||
|
|
||||||
|
# this target can't be called clean
|
||||||
|
clean-both:
|
||||||
|
$(MAKE) PROGRAM=client clean
|
||||||
|
$(MAKE) PROGRAM=server clean
|
||||||
|
|
||||||
include ../../src/makeprog.env
|
include ../../src/makeprog.env
|
||||||
|
|
||||||
|
-include $(DEPFILES)
|
||||||
|
Reference in New Issue
Block a user