You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

58 lines
1.7 KiB

  1. diff --git a/usr/Makefile b/usr/Makefile
  2. index 1fae7e7..b05b970 100644
  3. --- a/usr/Makefile
  4. +++ b/usr/Makefile
  5. @@ -1,13 +1,13 @@
  6. sbindir ?= $(PREFIX)/sbin
  7. libdir ?= $(PREFIX)/lib/tgt
  8. -ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
  9. +#ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
  10. CFLAGS += -DUSE_SIGNALFD
  11. -endif
  12. +#endif
  13. -ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),)
  14. +#ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),)
  15. CFLAGS += -DUSE_TIMERFD
  16. -endif
  17. +#endif
  18. TGTD_OBJS += $(addprefix iscsi/, conn.o param.o session.o \
  19. iscsid.o target.o chap.o sha1.o md5.o transport.o iscsi_tcp.o \
  20. @@ -25,8 +25,9 @@ ifneq ($(SD_NOTIFY),)
  21. CFLAGS += -DUSE_SYSTEMD
  22. endif
  23. -ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),)
  24. -CFLAGS += -DUSE_EVENTFD
  25. +#ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e $(STAGING_DIR)/usr/include/libaio.h && echo 1),)
  26. +ifneq ((test -e $(STAGING_DIR)/usr/include/libaio.h && echo 1),)
  27. +CFLAGS += -DUSE_EVENTFD -I$(STAGING_DIR)/usr/include/
  28. TGTD_OBJS += bs_aio.o
  29. LIBS += -laio
  30. endif
  31. @@ -55,7 +56,7 @@ ifneq ($(SD_NOTIFY),)
  32. LIBS += -lsystemd
  33. endif
  34. -PROGRAMS += tgtd tgtadm tgtimg
  35. +PROGRAMS += tgtd tgtadm
  36. TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \
  37. concat_buf.o parser.o spc.o sbc.o mmc.o osd.o scc.o smc.o \
  38. ssc.o libssc.o bs_rdwr.o bs_ssc.o \
  39. @@ -82,14 +83,8 @@ tgtadm: $(TGTADM_OBJS)
  40. -include $(TGTADM_DEP)
  41. -TGTIMG_OBJS = tgtimg.o libssc.o libcrc32c.o
  42. TGTIMG_DEP = $(TGTIMG_OBJS:.o=.d)
  43. -tgtimg: $(TGTIMG_OBJS)
  44. - $(CC) $^ -o $@
  45. -
  46. --include $(TGTIMG_DEP)
  47. -
  48. %.o: %.c
  49. $(CC) -c $(CFLAGS) $*.c -o $*.o
  50. @$(CC) -MM $(CFLAGS) -MF $*.d -MT $*.o $*.c