add CPPFLAGS and LDFALGS, run chrpath on .so files
This commit is contained in:
parent
e32e72d9e5
commit
21d739de96
2
Makefile
2
Makefile
|
@ -29,7 +29,7 @@ all: new_fp fp2bit bit2fp draw_svg_tiles autotest hstrrep \
|
||||||
include Makefile.common
|
include Makefile.common
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
$(CC) $(CFLAGS) -o $@ -c $<
|
$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
|
||||||
$(MKDEP)
|
$(MKDEP)
|
||||||
|
|
||||||
libs/%.so: FAKE
|
libs/%.so: FAKE
|
||||||
|
|
|
@ -41,11 +41,11 @@ libfpga-floorplan.so: $(LIBFPGA_FLOORPLAN_OBJS)
|
||||||
libfpga-control.so: $(LIBFPGA_CONTROL_OBJS)
|
libfpga-control.so: $(LIBFPGA_CONTROL_OBJS)
|
||||||
|
|
||||||
%.so:
|
%.so:
|
||||||
$(CC) -shared -Wl,-soname,$@.$(LIBS_VERSION) -o $@.$(LIBS_VERSION) $^
|
$(CC) $(LDFLAGS) -shared -Wl,-soname,$@.$(LIBS_VERSION) -o $@.$(LIBS_VERSION) $^
|
||||||
@rm -f $@ && ln -s $@.$(LIBS_VERSION) $@
|
@rm -f $@ && ln -s $@.$(LIBS_VERSION) $@
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
$(CC) $(CFLAGS) -fPIC -o $@ -c $<
|
$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ -c $<
|
||||||
$(MKDEP)
|
$(MKDEP)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
@ -56,6 +56,7 @@ install: all
|
||||||
mkdir -p $(DESTDIR)/$(PREFIX)/include/
|
mkdir -p $(DESTDIR)/$(PREFIX)/include/
|
||||||
install -m 644 $(DYNAMIC_HEADS) $(DESTDIR)/$(PREFIX)/include/
|
install -m 644 $(DYNAMIC_HEADS) $(DESTDIR)/$(PREFIX)/include/
|
||||||
for f in $(DYNAMIC_LIBS); do \
|
for f in $(DYNAMIC_LIBS); do \
|
||||||
|
chrpath -d $$f.$(LIBS_VERSION) && \
|
||||||
install -m 644 $$f.$(LIBS_VERSION) $(DESTDIR)/$(PREFIX)/lib/$$f.$(LIBS_VERSION) && \
|
install -m 644 $$f.$(LIBS_VERSION) $(DESTDIR)/$(PREFIX)/lib/$$f.$(LIBS_VERSION) && \
|
||||||
(cd $(DESTDIR)/$(PREFIX)/lib/ && ln -s $$f.$(LIBS_VERSION) $$f) \
|
(cd $(DESTDIR)/$(PREFIX)/lib/ && ln -s $$f.$(LIBS_VERSION) $$f) \
|
||||||
|| exit 1; done
|
|| exit 1; done
|
||||||
|
|
|
@ -20,7 +20,7 @@ mini-jtag: $(OBJS)
|
||||||
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
|
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
$(CC) $(CFLAGS) -o $@ -c $<
|
$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
|
||||||
$(MKDEP)
|
$(MKDEP)
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
|
|
Loading…
Reference in New Issue
Block a user