0004-Fix-out-of-tree-builds.patch 5.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157
  1. From cccec0344d68dac4100b6f260ee24e7c2da9dfda Mon Sep 17 00:00:00 2001
  2. From: Hongxu Jia <hongxu.jia@windriver.com>
  3. Date: Tue, 15 Aug 2017 15:08:22 +0800
  4. Subject: [PATCH 04/11] Fix out of tree builds
  5. Upstream-Status: Pending
  6. RP 2013/03/21
  7. Rebase to 4.3.6
  8. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  9. ---
  10. client/Makefile.am | 4 ++--
  11. common/Makefile.am | 3 ++-
  12. dhcpctl/Makefile.am | 2 ++
  13. omapip/Makefile.am | 1 +
  14. relay/Makefile.am | 2 +-
  15. server/Makefile.am | 2 +-
  16. 6 files changed, 9 insertions(+), 5 deletions(-)
  17. Index: dhcp-4.4.3/common/Makefile.am
  18. ===================================================================
  19. --- dhcp-4.4.3.orig/common/Makefile.am
  20. +++ dhcp-4.4.3/common/Makefile.am
  21. @@ -1,8 +1,8 @@
  22. AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
  23. AM_CFLAGS = $(LDAP_CFLAGS)
  24. -lib_LIBRARIES = libdhcp.a
  25. -libdhcp_a_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c dhcp4o6.c \
  26. +lib_LTLIBRARIES = libdhcp.la
  27. +libdhcp_la_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c dhcp4o6.c \
  28. discover.c dispatch.c dlpi.c dns.c ethernet.c execute.c \
  29. fddi.c icmp.c inet.c lpf.c memory.c nit.c ns_name.c \
  30. options.c packet.c parse.c print.c raw.c resolv.c \
  31. Index: dhcp-4.4.3/dhcpctl/Makefile.am
  32. ===================================================================
  33. --- dhcp-4.4.3.orig/dhcpctl/Makefile.am
  34. +++ dhcp-4.4.3/dhcpctl/Makefile.am
  35. @@ -4,30 +4,30 @@ BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@
  36. BINDLIBISCDIR=@BINDLIBISCDIR@
  37. bin_PROGRAMS = omshell
  38. -lib_LIBRARIES = libdhcpctl.a
  39. +lib_LTLIBRARIES = libdhcpctl.la
  40. noinst_PROGRAMS = cltest cltest2
  41. man_MANS = omshell.1 dhcpctl.3
  42. EXTRA_DIST = $(man_MANS)
  43. omshell_SOURCES = omshell.c
  44. -omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
  45. - $(BINDLIBIRSDIR)/libirs.a \
  46. - $(BINDLIBDNSDIR)/libdns.a \
  47. - $(BINDLIBISCCFGDIR)/libisccfg.a \
  48. - $(BINDLIBISCDIR)/libisc.a
  49. +omshell_LDADD = libdhcpctl.la ../common/libdhcp.la ../omapip/libomapi.la \
  50. + $(BINDLIBIRSDIR)/libirs.la \
  51. + $(BINDLIBDNSDIR)/libdns.la \
  52. + $(BINDLIBISCCFGDIR)/libisccfg.la \
  53. + $(BINDLIBISCDIR)/libisc.la
  54. -libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
  55. +libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c
  56. cltest_SOURCES = cltest.c
  57. -cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
  58. - $(BINDLIBIRSDIR)/libirs.a \
  59. - $(BINDLIBDNSDIR)/libdns.a \
  60. - $(BINDLIBISCCFGDIR)/libisccfg.a \
  61. - $(BINDLIBISCDIR)/libisc.a
  62. +cltest_LDADD = libdhcpctl.la ../common/libdhcp.la ../omapip/libomapi.la \
  63. + $(BINDLIBIRSDIR)/libirs.la \
  64. + $(BINDLIBDNSDIR)/libdns.la \
  65. + $(BINDLIBISCCFGDIR)/libisccfg.la \
  66. + $(BINDLIBISCDIR)/libisc.la
  67. cltest2_SOURCES = cltest2.c
  68. -cltest2_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
  69. - $(BINDLIBIRSDIR)/libirs.a \
  70. - $(BINDLIBDNSDIR)/libdns.a \
  71. - $(BINDLIBISCCFGDIR)/libisccfg.a \
  72. - $(BINDLIBISCDIR)/libisc.a
  73. +cltest2_LDADD = libdhcpctl.la ../common/libdhcp.la ../omapip/libomapi.la \
  74. + $(BINDLIBIRSDIR)/libirs.la \
  75. + $(BINDLIBDNSDIR)/libdns.la \
  76. + $(BINDLIBISCCFGDIR)/libisccfg.la \
  77. + $(BINDLIBISCDIR)/libisc.la
  78. Index: dhcp-4.4.3/server/Makefile.am
  79. ===================================================================
  80. --- dhcp-4.4.3.orig/server/Makefile.am
  81. +++ dhcp-4.4.3/server/Makefile.am
  82. @@ -4,7 +4,7 @@
  83. # production code. Sadly, we are not there yet.
  84. SUBDIRS = . tests
  85. -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
  86. +AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
  87. dist_sysconf_DATA = dhcpd.conf.example
  88. sbin_PROGRAMS = dhcpd
  89. Index: dhcp-4.4.3/client/Makefile.am
  90. ===================================================================
  91. --- dhcp-4.4.3.orig/client/Makefile.am
  92. +++ dhcp-4.4.3/client/Makefile.am
  93. @@ -5,7 +5,7 @@
  94. SUBDIRS = . tests
  95. AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"'
  96. -AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"'
  97. +AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes
  98. dist_sysconf_DATA = dhclient.conf.example
  99. sbin_PROGRAMS = dhclient
  100. Index: dhcp-4.4.3/omapip/Makefile.am
  101. ===================================================================
  102. --- dhcp-4.4.3.orig/omapip/Makefile.am
  103. +++ dhcp-4.4.3/omapip/Makefile.am
  104. @@ -3,10 +3,10 @@ BINDLIBDNSDIR=@BINDLIBDNSDIR@
  105. BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@
  106. BINDLIBISCDIR=@BINDLIBISCDIR@
  107. -lib_LIBRARIES = libomapi.a
  108. +lib_LTLIBRARIES = libomapi.la
  109. noinst_PROGRAMS = svtest
  110. -libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
  111. +libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
  112. errwarn.c listener.c dispatch.c generic.c support.c \
  113. handle.c message.c convert.c hash.c auth.c inet_addr.c \
  114. array.c trace.c toisc.c iscprint.c isclib.c
  115. @@ -15,8 +15,8 @@ man_MANS = omapi.3
  116. EXTRA_DIST = $(man_MANS)
  117. svtest_SOURCES = test.c
  118. -svtest_LDADD = libomapi.a \
  119. - $(BINDLIBIRSDIR)/libirs.a \
  120. - $(BINDLIBDNSDIR)/libdns.a \
  121. - $(BINDLIBISCCFGDIR)/libisccfg.a \
  122. - $(BINDLIBISCDIR)/libisc.a
  123. +svtest_LDADD = libomapi.la \
  124. + $(BINDLIBIRSDIR)/libirs.la \
  125. + $(BINDLIBDNSDIR)/libdns.la \
  126. + $(BINDLIBISCCFGDIR)/libisccfg.la \
  127. + $(BINDLIBISCDIR)/libisc.la
  128. Index: dhcp-4.4.3/relay/Makefile.am
  129. ===================================================================
  130. --- dhcp-4.4.3.orig/relay/Makefile.am
  131. +++ dhcp-4.4.3/relay/Makefile.am
  132. @@ -1,6 +1,6 @@
  133. SUBDIRS = . tests
  134. -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
  135. +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
  136. sbin_PROGRAMS = dhcrelay
  137. dhcrelay_SOURCES = dhcrelay.c