Skip to content

Commit 38201e2

Browse files
committed
Erk, the whole directory structure changed on us here...
1 parent a8313f9 commit 38201e2

31 files changed

+985
-778
lines changed

src/interfaces/ecpg/include/Makefile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Generated automatically from Makefile.in by configure.
2+
SRCDIR= ../../..
3+
include $(SRCDIR)/Makefile.global
4+
5+
all clean::
6+
@echo Nothing to be done.
7+
8+
install::
9+
install ecpglib.h $(HEADERDIR)
10+
install ecpgtype.h $(HEADERDIR)
11+
install sqlca.h $(HEADERDIR)
12+
13+
uninstall::
14+
rm -f $(HEADERDIR)/ecpglib.h
15+
rm -f $(HEADERDIR)/ecpgtype.h
16+
rm -f $(HEADERDIR)/sqlca.h
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
SRCDIR= ../../..
2+
include $(SRCDIR)/Makefile.global
3+
4+
all clean::
5+
@echo Nothing to be done.
6+
7+
install::
8+
install ecpglib.h $(HEADERDIR)
9+
install ecpgtype.h $(HEADERDIR)
10+
install sqlca.h $(HEADERDIR)
11+
12+
uninstall::
13+
rm -f $(HEADERDIR)/ecpglib.h
14+
rm -f $(HEADERDIR)/ecpgtype.h
15+
rm -f $(HEADERDIR)/sqlca.h

src/interfaces/ecpg/src/include/ecpglib.h renamed to src/interfaces/ecpg/include/ecpglib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <c.h>
22

3-
void ECPGdebug(int);
3+
void ECPGdebug(int, FILE *);
44
bool ECPGconnect(const char * dbname);
55
bool ECPGdo(int, char *, ...);
66
bool ECPGcommit(int);

src/interfaces/ecpg/src/include/ecpgtype.h renamed to src/interfaces/ecpg/include/ecpgtype.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
enum ECPGttype {
3333
ECPGt_char = 1, ECPGt_unsigned_char, ECPGt_short, ECPGt_unsigned_short,
3434
ECPGt_int, ECPGt_unsigned_int, ECPGt_long, ECPGt_unsigned_long,
35+
ECPGt_bool,
3536
ECPGt_float, ECPGt_double,
3637
ECPGt_varchar, ECPGt_varchar2,
3738
ECPGt_array,
3839
ECPGt_record,
3940
ECPGt_EOIT, /* End of insert types. */
4041
ECPGt_EORT /* End of result types. */
41-
4242
};
4343

4444
#define IS_SIMPLE_TYPE(type) ((type) >= ECPGt_char && (type) <= ECPGt_varchar2)

src/interfaces/ecpg/src/lib/Makefile renamed to src/interfaces/ecpg/lib/Makefile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
# Generated automatically from Makefile.in by configure.
2-
TOPDIR=/home/meskes/data/computer/databases/postgres/pgsql/src/interfaces/ecpg/../..
3-
PQ_INCLUDE=-I$(TOPDIR)/include -I$(TOPDIR)/interfaces/libpq
4-
POSTGRES_LIB=$(POSTGRESTOP)/lib
2+
SRCDIR= ../../..
3+
include $(SRCDIR)/Makefile.global
4+
5+
PQ_INCLUDE=-I$(SRCDIR)/include -I$(SRCDIR)/interfaces/libpq
56

67
all: lib
78

89
lib: libecpg.a
910

10-
clean::
11+
clean:
1112
rm -f *.o *.a core a.out *~
1213

13-
install:: libecpg.a
14-
install -m644 libecpg.a $(POSTGRES_LIB)
14+
install: libecpg.a
15+
install -m 644 libecpg.a $(LIBDIR)
16+
1517
uninstall::
16-
rm -f $(POSTGRES_LIB)/libecpg.a
18+
rm -f $(LIBDIR)/libecpg.a
1719

1820
# Rules that do something
1921
libecpg.a : libecpg.a(ecpglib.o) libecpg.a(typename.o)

src/interfaces/ecpg/src/lib/Makefile.in renamed to src/interfaces/ecpg/lib/Makefile.in

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
TOPDIR=@TOPSRC@
2-
PQ_INCLUDE=-I$(TOPDIR)/include -I$(TOPDIR)/interfaces/libpq
3-
POSTGRES_LIB=$(POSTGRESTOP)/lib
1+
SRCDIR= ../../..
2+
include $(SRCDIR)/Makefile.global
3+
4+
PQ_INCLUDE=-I$(SRCDIR)/include -I$(SRCDIR)/interfaces/libpq
45

56
all: lib
67

78
lib: libecpg.a
89

9-
clean::
10+
clean:
1011
rm -f *.o *.a core a.out *~
1112

12-
install:: libecpg.a
13-
install -m644 libecpg.a $(POSTGRES_LIB)
13+
install: libecpg.a
14+
install -m 644 libecpg.a $(LIBDIR)
15+
1416
uninstall::
15-
rm -f $(POSTGRES_LIB)/libecpg.a
17+
rm -f $(LIBDIR)/libecpg.a
1618

1719
# Rules that do something
1820
libecpg.a : libecpg.a(ecpglib.o) libecpg.a(typename.o)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy