ticker/makefile: stop using so many PG_* vars
authorMarko Kreen <markokr@gmail.com>
Thu, 6 Oct 2011 13:56:42 +0000 (15:56 +0200)
committerMarko Kreen <markokr@gmail.com>
Thu, 6 Oct 2011 13:56:42 +0000 (15:56 +0200)
sql/Makefile started to pass PG_CPPFLAGS on cmdline,
this breaks custom vars here.

sql/ticker/Makefile

index b88d0280e66ce21e811ad48e90f287ac2ab54005..9a0be6c136d44c10b1f052a5b82618713cc90a1b 100644 (file)
@@ -15,15 +15,12 @@ HDRS = $(LOCAL_HDRS) $(USUAL_HDRS)
 
 PG_INCDIR = $(shell $(PG_CONFIG) --includedir)
 PG_LIBDIR = $(shell $(PG_CONFIG) --libdir)
-PG_CPPFLAGS = -I$(PG_INCDIR)
-PG_LDFLAGS = -L$(PG_LIBDIR)
-PG_LIBS = -lpq -lm
 
 OBJS = $(SRCS:.c=.o) $(USUAL_OBJS)
 
-CPPFLAGS += $(USUAL_CPPFLAGS) $(PG_CPPFLAGS)
-LDFLAGS += $(PG_LDFLAGS)
-LIBS += $(PG_LIBS)
+CPPFLAGS += $(USUAL_CPPFLAGS) -I$(PG_INCDIR)
+LDFLAGS += -L$(PG_LIBDIR)
+LIBS += -lpq -lm
 
 all: $(PROGRAM)