Skip to content

Commit 0bf9d3a

Browse files
committed
Fix inadequate makefile-fu in ecpg regression tests. I think this
will fix current platypus build failure.
1 parent 6a7d3d0 commit 0bf9d3a

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/interfaces/ecpg/test/Makefile.regress

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
override CPPFLAGS := -I$(srcdir)/../../include -I$(libpq_srcdir) $(CPPFLAGS)
2-
override CFLAGS += $(PTHREAD_CFLAGS) -I$(srcdir)/../../include -I$(libpq_srcdir) -I../../include -I$(top_builddir)/src/include
3-
override LDFLAGS += -L../../ecpglib -L../../pgtypeslib -L../../../libpq
4-
override LIBS += -lpgtypes -lecpg -lpq
2+
override CFLAGS += $(PTHREAD_CFLAGS)
3+
4+
override LDFLAGS := -L../../ecpglib -L../../pgtypeslib -L../../../libpq $(LDFLAGS)
5+
override LIBS := -lpgtypes -lecpg -lpq $(LIBS) $(PTHREAD_LIBS)
56

67
ECPG = ../../preproc/ecpg -I$(srcdir)/../../include
78

89
%: %.c
9-
$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) $(PTHREAD_LIBS) -o $@
10+
$(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@
1011

1112
%.c: %.pgc ../regression.h
1213
$(ECPG) -o $@ -I$(srcdir) $<

0 commit comments

Comments
 (0)