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.
This commit is contained in:
parent
37017334af
commit
4b96b63166
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue