]> granicus.if.org Git - postgresql/commitdiff
Fix inadequate makefile-fu in ecpg regression tests. I think this
authorTom Lane <tgl@sss.pgh.pa.us>
Wed, 9 Aug 2006 22:48:17 +0000 (22:48 +0000)
committerTom Lane <tgl@sss.pgh.pa.us>
Wed, 9 Aug 2006 22:48:17 +0000 (22:48 +0000)
will fix current platypus build failure.

src/interfaces/ecpg/test/Makefile.regress

index b116c866e0664db940a977ec7697d68367f73176..c79393b7e099c1f17b3500103d4ff88bcc81d6e1 100644 (file)
@@ -1,12 +1,13 @@
 override CPPFLAGS := -I$(srcdir)/../../include -I$(libpq_srcdir) $(CPPFLAGS) 
-override CFLAGS += $(PTHREAD_CFLAGS) -I$(srcdir)/../../include -I$(libpq_srcdir) -I../../include -I$(top_builddir)/src/include
-override LDFLAGS += -L../../ecpglib -L../../pgtypeslib -L../../../libpq
-override LIBS += -lpgtypes -lecpg -lpq
+override CFLAGS += $(PTHREAD_CFLAGS) 
+
+override LDFLAGS := -L../../ecpglib -L../../pgtypeslib -L../../../libpq $(LDFLAGS)
+override LIBS := -lpgtypes -lecpg -lpq $(LIBS) $(PTHREAD_LIBS)
 
 ECPG = ../../preproc/ecpg -I$(srcdir)/../../include
 
 %: %.c
-       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) $(PTHREAD_LIBS) -o $@
+       $(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@
 
 %.c: %.pgc ../regression.h
        $(ECPG) -o $@ -I$(srcdir) $<