Merge branch 'hotfix/3.2.2' into develop

1 files changed, 14 insertions, 33 deletions

diff --git a/sql/ticker/Makefile b/sql/ticker/Makefile
index 9a0be6c1..5ad6eb18 100644
--- a/sql/ticker/Makefile
+++ b/sql/ticker/Makefile
@@ -1,53 +1,34 @@
 
 include ../../config.mak
 
-SRCS = pgqd.c maint.c ticker.c retry.c
-LOCAL_HDRS = pgqd.h
-
-USUAL_DIR = ../../lib
-USUAL_OBJDIR = .
-USUAL_LOCAL_SRCS = $(SRCS) $(LOCAL_HDRS)
-include $(USUAL_DIR)/Setup.mk
-
-PROGRAM = pgqd
-
-HDRS = $(LOCAL_HDRS) $(USUAL_HDRS)
-
 PG_INCDIR = $(shell $(PG_CONFIG) --includedir)
 PG_LIBDIR = $(shell $(PG_CONFIG) --libdir)
 
-OBJS = $(SRCS:.c=.o) $(USUAL_OBJS)
+bin_PROGRAMS = pgqd
 
-CPPFLAGS += $(USUAL_CPPFLAGS) -I$(PG_INCDIR)
-LDFLAGS += -L$(PG_LIBDIR)
-LIBS += -lpq -lm
+pgqd_SOURCES = pgqd.c maint.c ticker.c retry.c pgqd.h
+nodist_pgqd_SOURCES = pgqd.ini.h
+pgqd_CPPFLAGS = -I$(PG_INCDIR)
+pgqd_LDFLAGS = -L$(PG_LIBDIR)
+pgqd_LIBS = -lpq -lm
 
-all: $(PROGRAM)
-
-$(PROGRAM): $(OBJS)
-	$(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS)
+pgqd_EMBED_LIBUSUAL = 1
+USUAL_DIR = ../../lib
+AM_FEATURES = libusual
 
-$(OBJS): $(HDRS)
+EXTRA_DIST = pgqd.ini
+CLEANFILES = pgqd.ini.h
 
-%.o: $(USUAL_DIR)/usual/%.c $(USUAL_HDRS)
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c -o $@ $<
+include $(USUAL_DIR)/mk/antimake.mk
 
-pgqd.o: pgqd.ini.h
 pgqd.ini.h: pgqd.ini
 	sed -e 's/.*/"&\\n"/' $< > $@
 
-install: all
-	mkdir -p '$(DESTDIR)$(bindir)'
-	$(BININSTALL) -m 755 pgqd$(X) '$(DESTDIR)$(bindir)/pgqd'
+install: install-conf
+install-conf:
 	mkdir -p '$(DESTDIR)$(docdir)/conf'
 	$(INSTALL) -m 644 pgqd.ini '$(DESTDIR)$(docdir)/conf/pgqd.ini.templ'
 
-clean:
-	rm -f $(PROGRAM) $(OBJS) pgqd.ini.h
-
 tags:
 	ctags *.[ch] ../../lib/usual/*.[ch]
 
-distclean: clean
-installcheck:
-