f42077da74
Relnotes: https://exchange.nagios.org/directory/Addons/Database-Backends/NDOUtils/details#_ga=2.268107022.1239817101.1524600167-5880004.1524600167
86 lines
4.2 KiB
Text
86 lines
4.2 KiB
Text
--- src/Makefile.in.orig 2017-04-13 14:11:57 UTC
|
|
+++ src/Makefile.in
|
|
@@ -68,13 +68,9 @@ log2ndo: log2ndo.c $(COMMON_INC) $(COMMON_OBJS)
|
|
$(CC) $(CFLAGS) -o $@ log2ndo.c $(COMMON_OBJS) $(LDFLAGS) $(LIBS) $(MATHLIBS) $(SOCKETLIBS) $(OTHERLIBS)
|
|
|
|
ndo2db:
|
|
- $(MAKE) ndo2db-2x
|
|
$(MAKE) ndo2db-3x
|
|
$(MAKE) ndo2db-4x
|
|
|
|
-ndo2db-2x: queue.c ndo2db.c $(NDO_INC) $(NDO_OBJS) $(COMMON_INC) $(COMMON_OBJS) dbhandlers-2x.o $(SNPRINTF_O)
|
|
- $(CC) $(CFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_2X -o ndo2db-2x queue.c ndo2db.c dbhandlers-2x.o $(SNPRINTF_O) $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(MATHLIBS) $(OTHERLIBS)
|
|
-
|
|
ndo2db-3x: queue.c ndo2db.c $(NDO_INC) $(NDO_OBJS) $(COMMON_INC) $(COMMON_OBJS) dbhandlers-3x.o $(SNPRINTF_O)
|
|
$(CC) $(CFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_3X -o ndo2db-3x queue.c ndo2db.c dbhandlers-3x.o $(SNPRINTF_O) $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(MATHLIBS) $(OTHERLIBS)
|
|
|
|
@@ -82,13 +78,9 @@ ndo2db-4x: queue.c ndo2db.c $(NDO_INC) $(NDO_OBJS) $(C
|
|
$(CC) $(CFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_4X -o ndo2db-4x queue.c ndo2db.c dbhandlers-4x.o $(SNPRINTF_O) $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(MATHLIBS) $(OTHERLIBS)
|
|
|
|
ndomod:
|
|
- $(MAKE) ndomod-2x.o
|
|
$(MAKE) ndomod-3x.o
|
|
$(MAKE) ndomod-4x.o
|
|
|
|
-ndomod-2x.o: ndomod.c $(COMMON_INC) $(COMMON_OBJS) $(SNPRINTF_O)
|
|
- $(CC) $(MOD_CFLAGS) $(CFLAGS) -D BUILD_NAGIOS_2X -o ndomod-2x.o ndomod.c $(SNPRINTF_O) $(COMMON_OBJS) $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) $(SOCKETLIBS) $(OTHERLIBS)
|
|
-
|
|
ndomod-3x.o: ndomod.c $(COMMON_INC) $(COMMON_OBJS) $(SNPRINTF_O)
|
|
$(CC) $(MOD_CFLAGS) $(CFLAGS) -D BUILD_NAGIOS_3X -o ndomod-3x.o ndomod.c $(SNPRINTF_O) $(COMMON_OBJS) $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) $(SOCKETLIBS) $(OTHERLIBS)
|
|
|
|
@@ -107,9 +99,6 @@ utils.o: utils.c $(SRC_INCLUDE)/utils.h
|
|
db.o: db.c $(SRC_INCLUDE)/db.h
|
|
$(CC) $(CFLAGS) -c -o $@ db.c
|
|
|
|
-dbhandlers-2x.o: dbhandlers.c $(SRC_INCLUDE)/dbhandlers.h
|
|
- $(CC) $(CFLAGS) -D BUILD_NAGIOS_2X -c -o $@ dbhandlers.c
|
|
-
|
|
dbhandlers-3x.o: dbhandlers.c $(SRC_INCLUDE)/dbhandlers.h
|
|
$(CC) $(CFLAGS) -D BUILD_NAGIOS_3X -c -o $@ dbhandlers.c
|
|
|
|
@@ -117,7 +106,7 @@ dbhandlers-4x.o: dbhandlers.c $(SRC_INCLUDE)/dbhandler
|
|
$(CC) $(CFLAGS) $(CFLAGS_4X) -D BUILD_NAGIOS_4X -c -o $@ dbhandlers.c
|
|
|
|
clean:
|
|
- rm -f core file2sock log2ndo ndo2db-2x ndo2db-3x ndo2db-4x sockdebug *.o
|
|
+ rm -f core file2sock log2ndo ndo2db-3x ndo2db-4x sockdebug *.o
|
|
rm -f *~ */*~
|
|
|
|
distclean: clean
|
|
@@ -136,30 +125,26 @@ install: install-4x
|
|
@echo " If you want to install NDOUtils for Nagios v3.x"
|
|
@echo " please type 'make install-3x"
|
|
@echo ""
|
|
- @echo " If you want to install NDOUtils for Nagios v2.x"
|
|
- @echo " please type 'make install-2x"
|
|
- @echo ""
|
|
- @echo ""
|
|
@echo " Next step should be the database initialization/upgrade"
|
|
@echo " cd into the db/ directory and either:"
|
|
@echo " ./installdb (for a new installation) or:"
|
|
@echo " ./upgradedb (for an existing one)"
|
|
@echo ""
|
|
|
|
-install-2x:
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR)
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
|
|
- $(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-2x $(DESTDIR)$(BINDIR)/ndo2db
|
|
- $(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-2x.o $(DESTDIR)$(BINDIR)/ndomod.o
|
|
-
|
|
install-3x:
|
|
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR)
|
|
+ $(INSTALL) -m 774 $(INSTALL_OPTS) file2sock $(DESTDIR)$(BINDIR)
|
|
+ $(INSTALL) -m 774 $(INSTALL_OPTS) log2ndo $(DESTDIR)$(BINDIR)
|
|
+ $(INSTALL) -m 774 $(INSTALL_OPTS) sockdebug $(DESTDIR)$(BINDIR)
|
|
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
|
|
$(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-3x $(DESTDIR)$(BINDIR)/ndo2db
|
|
$(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-3x.o $(DESTDIR)$(BINDIR)/ndomod.o
|
|
|
|
install-4x:
|
|
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR)
|
|
+ $(INSTALL) -m 774 $(INSTALL_OPTS) file2sock $(DESTDIR)$(BINDIR)
|
|
+ $(INSTALL) -m 774 $(INSTALL_OPTS) log2ndo $(DESTDIR)$(BINDIR)
|
|
+ $(INSTALL) -m 774 $(INSTALL_OPTS) sockdebug $(DESTDIR)$(BINDIR)
|
|
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
|
|
$(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-4x $(DESTDIR)$(BINDIR)/ndo2db
|
|
$(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-4x.o $(DESTDIR)$(BINDIR)/ndomod.o
|