7a06ec90c1
- update Makefile-error-dependency.patch to avoid transient error OBS-URL: https://build.opensuse.org/request/show/400561 OBS-URL: https://build.opensuse.org/package/show/Base:System/ledmon?expand=0&rev=12
60 lines
1.5 KiB
Diff
60 lines
1.5 KiB
Diff
---
|
|
Makefile | 11 +++--------
|
|
src/Makefile | 6 +++---
|
|
2 files changed, 6 insertions(+), 11 deletions(-)
|
|
|
|
Index: ledmon-0.79/src/Makefile
|
|
===================================================================
|
|
--- ledmon-0.79.orig/src/Makefile
|
|
+++ ledmon-0.79/src/Makefile
|
|
@@ -56,7 +56,7 @@ LEDCTL_OBJECTS=\
|
|
$(OBJECTS)
|
|
|
|
CFLAGS=-O0 -g -Wall
|
|
-DEFFLAGS=-D_DEBUG -D_GNU_SOURCE -D_BSD_SOURCE -DDMALLOC_DISABLE
|
|
+DEFFLAGS=-D_DEBUG -D_GNU_SOURCE -D_DEFAULT_SOURCE -DDMALLOC_DISABLE
|
|
INCFLAGS=-I../config
|
|
LDFLAGS=-O0 -g $(DEFFLAGS) -lsgutils2
|
|
|
|
@@ -65,10 +65,10 @@ SOURCES:=$(shell find -name "*.[cC]" -pr
|
|
default: all
|
|
|
|
ledmon: $(OUTDIR)/.depend $(LEDMON_OBJECTS)
|
|
- $(CC) $(LDFLAGS) $(LDLIBS) $(LEDMON_OBJECTS) -o $@
|
|
+ $(CC) $(LDLIBS) $(LEDMON_OBJECTS) -o $@ $(LDFLAGS)
|
|
|
|
ledctl: $(OUTDIR)/.depend $(LEDCTL_OBJECTS)
|
|
- $(CC) $(LDFLAGS) $(LDLIBS) $(LEDCTL_OBJECTS) -o $@
|
|
+ $(CC) $(LDLIBS) $(LEDCTL_OBJECTS) -o $@ $(LDFLAGS)
|
|
|
|
$(OUTDIR)/%.o: %.c
|
|
$(CC) $(CFLAGS) $(DEFFLAGS) $(INCFLAGS) -c $< -o $@
|
|
Index: ledmon-0.79/Makefile
|
|
===================================================================
|
|
--- ledmon-0.79.orig/Makefile
|
|
+++ ledmon-0.79/Makefile
|
|
@@ -19,20 +19,15 @@
|
|
# Installation directory
|
|
DESTDIR?=
|
|
|
|
-.PHONY: ledmon ledctl man all
|
|
+.PHONY: man all
|
|
|
|
default: all
|
|
|
|
-ledmon:
|
|
- $(MAKE) -C src ledmon
|
|
-
|
|
-ledctl:
|
|
- $(MAKE) -C src ledctl
|
|
-
|
|
man:
|
|
$(MAKE) -C doc all
|
|
|
|
-all: ledmon ledctl man
|
|
+all:
|
|
+ $(MAKE) -C src all
|
|
|
|
install: all
|
|
$(MAKE) -C src DESTDIR=$(DESTDIR) install
|