From 4b96b6316693ee9286b93962f681fddd8798fe46 Mon Sep 17 00:00:00 2001 From: Cary R Date: Sat, 24 Dec 2011 09:59:56 -0800 Subject: [PATCH] Fix more tgt-pcb compile problems. On some systems having both %.o: %.c and %.o: %.cc rules confused the make system. This is directory only has C++ code so remove the %o: %.c rule. Also the C++ compiler should be used to link C++ object code. --- tgt-pcb/Makefile.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tgt-pcb/Makefile.in b/tgt-pcb/Makefile.in index 9e728681a..f8e8d16a0 100644 --- a/tgt-pcb/Makefile.in +++ b/tgt-pcb/Makefile.in @@ -66,10 +66,6 @@ Makefile: $(srcdir)/Makefile.in ../config.status dep: mkdir dep -%.o: %.c - $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o - mv $*.d dep - %.o: %.cc $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o mv $*.d dep @@ -83,7 +79,7 @@ else endif pcb.tgt: $O $(TGTDEPLIBS) - $(CC) @shared@ -o $@ $O $(TGTLDFLAGS) + $(CXX) @shared@ -o $@ $O $(TGTLDFLAGS) install: all installdirs $(libdir)/ivl$(suffix)/pcb.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/pcb.conf $(libdir)/ivl$(suffix)/pcb-s.conf