Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Pending |
| 2 | |
| 3 | Fix out of tree build issues so ${B} != ${S} works. |
| 4 | |
| 5 | RP 2013/03/18 |
| 6 | |
| 7 | Index: sysfsutils-2.1.0/cmd/Makefile.am |
| 8 | =================================================================== |
| 9 | --- sysfsutils-2.1.0.orig/cmd/Makefile.am 2013-03-08 08:57:27.224556508 +0000 |
| 10 | +++ sysfsutils-2.1.0/cmd/Makefile.am 2013-03-08 08:57:27.480556502 +0000 |
| 11 | @@ -1,6 +1,6 @@ |
| 12 | bin_PROGRAMS = systool |
| 13 | systool_SOURCES = systool.c names.c names.h |
| 14 | -INCLUDES = -I../include |
| 15 | +INCLUDES = -I$(srcdir)/../include |
| 16 | LDADD = ../lib/libsysfs.la |
| 17 | EXTRA_CFLAGS = @EXTRA_CFLAGS@ |
| 18 | AM_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CFLAGS) |
| 19 | Index: sysfsutils-2.1.0/lib/Makefile.am |
| 20 | =================================================================== |
| 21 | --- sysfsutils-2.1.0.orig/lib/Makefile.am 2013-03-08 08:57:27.224556508 +0000 |
| 22 | +++ sysfsutils-2.1.0/lib/Makefile.am 2013-03-08 08:57:27.480556502 +0000 |
| 23 | @@ -1,7 +1,7 @@ |
| 24 | lib_LTLIBRARIES = libsysfs.la |
| 25 | libsysfs_la_SOURCES = sysfs_utils.c sysfs_attr.c sysfs_class.c dlist.c \ |
| 26 | sysfs_device.c sysfs_driver.c sysfs_bus.c sysfs_module.c sysfs.h |
| 27 | -INCLUDES = -I../include |
| 28 | +INCLUDES = -I$(srcdir)/../include |
| 29 | libsysfs_la_LDFLAGS = -version-info 2:1:0 |
| 30 | EXTRA_CFLAGS = @EXTRA_CLFAGS@ |
| 31 | libsysfs_la_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CLFAGS) |
| 32 | Index: sysfsutils-2.1.0/test/Makefile.am |
| 33 | =================================================================== |
| 34 | --- sysfsutils-2.1.0.orig/test/Makefile.am 2013-03-08 08:57:27.224556508 +0000 |
| 35 | +++ sysfsutils-2.1.0/test/Makefile.am 2013-03-08 09:06:48.196543326 +0000 |
| 36 | @@ -2,14 +2,14 @@ |
| 37 | BUILT_SOURCES = test.h |
| 38 | CLEANFILES = test.h |
| 39 | test.h: |
| 40 | - ./create-test |
| 41 | + $(srcdir)/create-test $(srcdir)/libsysfs.conf |
| 42 | get_device_SOURCES = get_device.c |
| 43 | get_driver_SOURCES = get_driver.c |
| 44 | get_module_SOURCES = get_module.c |
| 45 | testlibsysfs_SOURCES = test.c test_attr.c test_bus.c test_class.c \ |
| 46 | test_device.c test_driver.c test_module.c test_utils.c \ |
| 47 | testout.c test-defs.h libsysfs.conf create-test |
| 48 | -INCLUDES = -I../include |
| 49 | +INCLUDES = -I$(srcdir)/../include |
| 50 | LDADD = ../lib/libsysfs.la |
| 51 | EXTRA_CFLAGS = @EXTRA_CLFAGS@ |
| 52 | AM_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CLFAGS) |
| 53 | Index: sysfsutils-2.1.0/test/create-test |
| 54 | =================================================================== |
| 55 | --- sysfsutils-2.1.0.orig/test/create-test 2005-11-28 10:22:10.000000000 +0000 |
| 56 | +++ sysfsutils-2.1.0/test/create-test 2013-03-08 09:07:03.372542838 +0000 |
| 57 | @@ -2,7 +2,7 @@ |
| 58 | |
| 59 | rm -f test.h |
| 60 | |
| 61 | -conf_file=./libsysfs.conf |
| 62 | +conf_file=$1 |
| 63 | |
| 64 | . $conf_file |
| 65 | |