Index: server/Makefile diff -u server/Makefile.orig server/Makefile --- server/Makefile.orig 2016-02-03 08:37:50.000000000 +0900 +++ server/Makefile 2016-06-06 01:46:16.352492000 +0900 @@ -31,7 +31,7 @@ PKG_INCLUDE := $(shell $(PKG_CONFIG) --cflags glib-2.0 gmodule-2.0 gthread-2.0) PKG_LIB := $(shell $(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0) -FLAGS = -O2 $(PKG_INCLUDE) +FLAGS = $(PKG_INCLUDE) FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -DGKRELLM_SERVER @@ -73,20 +73,31 @@ all: gkrellmd$(BINEXT) -gkrellmd$(BINEXT): check_env $(OBJS) $(EXTRAOBJS) +gkrellmd$(BINEXT): check_env gkrellmd.pc $(OBJS) $(EXTRAOBJS) $(CC) $(OBJS) $(EXTRAOBJS) -o $@ \ $(LDFLAGS) $(LIBS) $(LINK_FLAGS) -static: check_env $(OBJS) $(EXTRAOBJS) +static: check_env gkrellmd.pc $(OBJS) $(EXTRAOBJS) $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \ $(LDFLAGS) $(LIBS) $(LINK_FLAGS) +gkrellmd.pc: Makefile + echo "prefix=$(INSTALLROOT)" > gkrellmd.pc + echo "Name: GKrellMd" >> gkrellmd.pc + echo "Description: Extensible GLIB system monitoring application server" >> gkrellmd.pc + echo "Version: $(VERSION)" >> gkrellmd.pc + echo "Requires: glib-2.0" >> gkrellmd.pc + echo "Cflags: -I$(INCLUDEDIR)" >> gkrellmd.pc + freebsd2: $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellmd -freebsd3 freebsd: +freebsd3 freebsd4: $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellmd +freebsd5 freebsd6 freebsd7 freebsd8 freebsd: + $(MAKE) EXTRAOBJS= SYS_LIBS="-ldevstat -lmd" gkrellmd + # Darwin target for systems that still have libkvm darwin: $(MAKE) STRIP= HAVE_GETADDRINFO=1 \ @@ -135,27 +146,32 @@ SYS_LIBS="-lws2_32 -lwtsapi32 -lpdh -lnetapi32 -liphlpapi -lintl" \ all -install: install_bin install_inc install_man +install: install_bin install_inc install_man install_gkrellmd.pc install_bin: - $(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR) - $(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE_D)$(BINEXT) $(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT) + $(INSTALL) -d -m $(INSTALLDIRMODE) $(DESTDIR)$(SINSTALLDIR) + $(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE_D)$(BINEXT) $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT) install_inc: - $(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2 - $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2 + $(INSTALL) -d -m $(INCLUDEDIRMODE) $(DESTDIR)$(INCLUDEDIR)/gkrellm2 + $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(DESTDIR)$(INCLUDEDIR)/gkrellm2 install_man: - $(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR) - $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1 + $(INSTALL) -d -m $(MANDIRMODE) $(DESTDIR)$(SMANDIR) + $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(DESTDIR)$(SMANDIR)/$(PACKAGE_D).8 install_cfg: - $(INSTALL) -d -m $(CFGDIRMODE) $(CFGDIR) - $(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(CFGDIR)/gkrellmd.conf + $(INSTALL) -d -m $(CFGDIRMODE) $(DESTDIR)$(CFGDIR) + $(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(DESTDIR)$(CFGDIR)/gkrellmd.conf + +install_gkrellmd.pc: + $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR) + $(INSTALL) -c -m $(INCLUDEMODE) gkrellmd.pc $(DESTDIR)$(PKGCONFIGDIR) uninstall: rm -f $(SINSTALLDIR)/$(PACKAGE_D) rm -f $(SMANDIR)/$(PACKAGE_D).1 + rm -f $(PKGCONFIGDIR)/gkrellmd.pc install_darwin install_darwin9 install_macosx: $(MAKE) install STRIP= @@ -186,6 +202,7 @@ clean: $(RM) *.o *~ *.bak configure.h configure.log gkrellmd gkrellmd.exe \ libgkrellmd.a core + $(RM) gkrellmd.pc SYSDEPS = ../src/sysdeps/bsd-common.c ../src/sysdeps/bsd-net-open.c \ ../src/sysdeps/darwin.c \