Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | When building use the libtool intermediate .lo files instead of explicitly using |
| 2 | the .o files. Under libtool foo.lo is the libtool intermediate wrapper, foo.o is |
| 3 | a static build, and .libs/foo.o is a shared build. |
| 4 | |
| 5 | If static libraries have been disabled globally then libtool won't generate them |
| 6 | and explicit references to foo.o won't be satisfied. |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 10 | |
| 11 | diff --git a/Makefile b/Makefile |
| 12 | index bb695c6..5f60146 100644 |
| 13 | --- a/Makefile |
| 14 | +++ b/Makefile |
| 15 | @@ -28,7 +28,7 @@ endif |
| 16 | |
| 17 | .SUFFIXES: |
| 18 | |
| 19 | -OBJS=apmlib.o |
| 20 | +OBJS=apmlib.lo |
| 21 | EXES=apm apmd xapm apmsleep |
| 22 | HEADERS=apm.h |
| 23 | |
| 24 | @@ -66,22 +66,22 @@ all: $(EXES) |
| 25 | |
| 26 | $(OBJS): $(HEADERS) |
| 27 | |
| 28 | -%.o: %.c |
| 29 | +%.lo: %.c |
| 30 | $(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) $< |
| 31 | |
| 32 | -%: %.o $(LIBAPM) |
| 33 | +%: %.lo $(LIBAPM) |
| 34 | $(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM) |
| 35 | |
| 36 | -xapm.o: xapm.c |
| 37 | +xapm.lo: xapm.c |
| 38 | $(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) -DNARROWPROTO $< |
| 39 | |
| 40 | -apmd: apmd.o |
| 41 | +apmd: apmd.lo |
| 42 | |
| 43 | -apmsleep: apmsleep.o |
| 44 | +apmsleep: apmsleep.lo |
| 45 | |
| 46 | -apmexists: apmexists.o |
| 47 | +apmexists: apmexists.lo |
| 48 | |
| 49 | -xapm: xapm.o $(LIBAPM) |
| 50 | +xapm: xapm.lo $(LIBAPM) |
| 51 | $(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM) $(XLDFLAGS) $(XLIBS) |
| 52 | |
| 53 | $(LIBAPM): apmlib.lo |