48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
--- clients/Makefile.am
|
|
+++ clients/Makefile.am
|
|
@@ -42,10 +42,7 @@ libupsclient_la_LDFLAGS = -version-info
|
|
../common/libcommon.a: FORCE
|
|
(cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) libcommon.a)
|
|
|
|
-../common/parseconf.o:
|
|
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.o)
|
|
-
|
|
-../common/parseconf.lo:
|
|
+../common/parseconf.lo ../common/parseconf.o:
|
|
(cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.lo)
|
|
|
|
FORCE:
|
|
--- common/Makefile.am
|
|
+++ common/Makefile.am
|
|
@@ -6,7 +6,7 @@ noinst_LIBRARIES = libcommon.a
|
|
libcommon_a_SOURCES = common.c ../include/nut_version.h
|
|
libcommon_a_LIBADD = $(LIBOBJS) $(ALLOCA)
|
|
|
|
-all: libcommon.a upsconf.o parseconf.o state.o parseconf.lo
|
|
+all: upsconf.o state.o parseconf.lo
|
|
|
|
# Define a dummy library so that Automake builds rules for the
|
|
# corresponding object files. This library is not actually built,
|
|
--- drivers/Makefile.am
|
|
+++ drivers/Makefile.am
|
|
@@ -201,7 +201,7 @@ MOSTLYCLEANFILES = libnuthalmain.a
|
|
(cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) upsconf.o)
|
|
|
|
../common/parseconf.o:
|
|
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.o)
|
|
+ (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.lo)
|
|
|
|
../common/state.o:
|
|
(cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) state.o)
|
|
--- server/Makefile.am
|
|
+++ server/Makefile.am
|
|
@@ -23,7 +23,7 @@ sockdebug_SOURCES = sockdebug.c
|
|
(cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) upsconf.o)
|
|
|
|
../common/parseconf.o:
|
|
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.o)
|
|
+ (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.lo)
|
|
|
|
../common/state.o:
|
|
(cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) state.o)
|