diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | source.cfg | 2 | ||||
| -rw-r--r-- | sql/ticker/Makefile | 47 |
5 files changed, 23 insertions, 36 deletions
@@ -1,5 +1,5 @@ -2014-04-09 - SkyTools 3.2.1 +2014-04-10 - SkyTools 3.2.2 = Fixes = diff --git a/configure.ac b/configure.ac index 3d573ab1..eec6c639 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(skytools, 3.2.1) +AC_INIT(skytools, 3.2.2) AC_CONFIG_SRCDIR(python/londiste.py) AC_CONFIG_HEADER(lib/usual/config.h) AC_PREREQ([2.59]) diff --git a/debian/changelog b/debian/changelog index 066e8471..f0cb9d34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +skytools3 (3.2.2) experimental; urgency=low + + * v3.2.2 + + -- martinko <gamato@users.sf.net> Thu, 10 Apr 2014 14:00:00 +0200 + skytools3 (3.2.1) experimental; urgency=low * v3.2.1 @@ -34,7 +34,7 @@ prune debian/tmp include python/skytools/installer_config.py.in prune python/skytools/installer_config.py -recursive-include lib *.[chg] *.m4 *.mk *.h.in *.sh *-sh Setup.mk README COPYRIGHT +recursive-include lib *.[chg] *.m4 *.mk *.h.in *.sh *-sh README COPYRIGHT prune lib/mk/temos exclude lib/usual/config.h prune lib/test 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: - |