mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From: Darren King <darrenk@insightdist.com>

Browse Source 
This patch will...

1. Remove the "-Wall" option from the ecpg/lib and ecpg/preproc Makefile.

2. Remove the addition of $(SRCDIR)/include and-or $(SRCDIR)/backend from
   ecpg/lib, ecpg/preproc, libpq and utils Makefiles. Already in CFLAGS...

3. Set MK_NO_LORDER and RANLIB in Makefile.aix to avoid a couple of extra
   steps taken care of by the 'ld' command anyways.
This commit is contained in:
Marc G. Fournier 1998-02-27 02:41:21 +00:00
parent 877224154d
commit 296a942b56
7 changed files with 229 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/parser/gram.c
View File

@ -210,7 +210,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.2 1998/02/21 06:31:46 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.3 1998/02/27 02:40:36 scrappy Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
@ -287,7 +287,7 @@ typedef union
char chr; char chr;
char *str; char *str;
bool boolean; bool boolean;
bool* pboolean; /* for pg_user privileges */ bool* pboolean; /* for pg_shadow privileges */
List *list; List *list;
Node *node; Node *node;
Value *value; Value *value;

431
src/backend/parser/parse.h
View File

@ -1,225 +1,224 @@
typedef union typedef union
{ {
double dval; double dval;
int ival; int ival;
char chr; char chr;
char *str; char *str;
bool boolean; bool boolean;
bool *pboolean; /* for pg_user privileges */ bool* pboolean; /* for pg_shadow privileges */
List *list; List *list;
Node *node; Node *node;
Value *value; Value *value;
Attr *attr; Attr *attr;
TypeName *typnam; TypeName *typnam;
DefElem *defelt; DefElem *defelt;
ParamString *param; ParamString *param;
SortGroupBy *sortgroupby; SortGroupBy *sortgroupby;
IndexElem *ielem; IndexElem *ielem;
RangeVar *range; RangeVar *range;
RelExpr *relexp; RelExpr *relexp;
A_Indices *aind; A_Indices *aind;
ResTarget *target; ResTarget *target;
ParamNo *paramno; ParamNo *paramno;
VersionStmt *vstmt; VersionStmt *vstmt;
DefineStmt *dstmt; DefineStmt *dstmt;
RuleStmt *rstmt; RuleStmt *rstmt;
InsertStmt *astmt; InsertStmt *astmt;
} YYSTYPE; } YYSTYPE;
#define ACTION 258
#define ACTION 258 #define ADD 259
#define ADD 259 #define ALL 260
#define ALL 260 #define ALTER 261
#define ALTER 261 #define AND 262
#define AND 262 #define ANY 263
#define ANY 263 #define AS 264
#define AS 264 #define ASC 265
#define ASC 265 #define BEGIN_TRANS 266
#define BEGIN_TRANS 266 #define BETWEEN 267
#define BETWEEN 267 #define BOTH 268
#define BOTH 268 #define BY 269
#define BY 269 #define CASCADE 270
#define CASCADE 270 #define CAST 271
#define CAST 271 #define CHAR 272
#define CHAR 272 #define CHARACTER 273
#define CHARACTER 273 #define CHECK 274
#define CHECK 274 #define CLOSE 275
#define CLOSE 275 #define COLLATE 276
#define COLLATE 276 #define COLUMN 277
#define COLUMN 277 #define COMMIT 278
#define COMMIT 278 #define CONSTRAINT 279
#define CONSTRAINT 279 #define CREATE 280
#define CREATE 280 #define CROSS 281
#define CROSS 281 #define CURRENT 282
#define CURRENT 282 #define CURRENT_DATE 283
#define CURRENT_DATE 283 #define CURRENT_TIME 284
#define CURRENT_TIME 284 #define CURRENT_TIMESTAMP 285
#define CURRENT_TIMESTAMP 285 #define CURRENT_USER 286
#define CURRENT_USER 286 #define CURSOR 287
#define CURSOR 287 #define DAY_P 288
#define DAY_P 288 #define DECIMAL 289
#define DECIMAL 289 #define DECLARE 290
#define DECLARE 290 #define DEFAULT 291
#define DEFAULT 291 #define DELETE 292
#define DELETE 292 #define DESC 293
#define DESC 293 #define DISTINCT 294
#define DISTINCT 294 #define DOUBLE 295
#define DOUBLE 295 #define DROP 296
#define DROP 296 #define END_TRANS 297
#define END_TRANS 297 #define EXECUTE 298
#define EXECUTE 298 #define EXISTS 299
#define EXISTS 299 #define EXTRACT 300
#define EXTRACT 300 #define FETCH 301
#define FETCH 301 #define FLOAT 302
#define FLOAT 302 #define FOR 303
#define FOR 303 #define FOREIGN 304
#define FOREIGN 304 #define FROM 305
#define FROM 305 #define FULL 306
#define FULL 306 #define GRANT 307
#define GRANT 307 #define GROUP 308
#define GROUP 308 #define HAVING 309
#define HAVING 309 #define HOUR_P 310
#define HOUR_P 310 #define IN 311
#define IN 311 #define INNER_P 312
#define INNER_P 312 #define INSERT 313
#define INSERT 313 #define INTERVAL 314
#define INTERVAL 314 #define INTO 315
#define INTO 315 #define IS 316
#define IS 316 #define JOIN 317
#define JOIN 317 #define KEY 318
#define KEY 318 #define LANGUAGE 319
#define LANGUAGE 319 #define LEADING 320
#define LEADING 320 #define LEFT 321
#define LEFT 321 #define LIKE 322
#define LIKE 322 #define LOCAL 323
#define LOCAL 323 #define MATCH 324
#define MATCH 324 #define MINUTE_P 325
#define MINUTE_P 325 #define MONTH_P 326
#define MONTH_P 326 #define NATIONAL 327
#define NATIONAL 327 #define NATURAL 328
#define NATURAL 328 #define NCHAR 329
#define NCHAR 329 #define NO 330
#define NO 330 #define NOT 331
#define NOT 331 #define NOTIFY 332
#define NOTIFY 332 #define NULL_P 333
#define NULL_P 333 #define NUMERIC 334
#define NUMERIC 334 #define ON 335
#define ON 335 #define OPTION 336
#define OPTION 336 #define OR 337
#define OR 337 #define ORDER 338
#define ORDER 338 #define OUTER_P 339
#define OUTER_P 339 #define PARTIAL 340
#define PARTIAL 340 #define POSITION 341
#define POSITION 341 #define PRECISION 342
#define PRECISION 342 #define PRIMARY 343
#define PRIMARY 343 #define PRIVILEGES 344
#define PRIVILEGES 344 #define PROCEDURE 345
#define PROCEDURE 345 #define PUBLIC 346
#define PUBLIC 346 #define REFERENCES 347
#define REFERENCES 347 #define REVOKE 348
#define REVOKE 348 #define RIGHT 349
#define RIGHT 349 #define ROLLBACK 350
#define ROLLBACK 350 #define SECOND_P 351
#define SECOND_P 351 #define SELECT 352
#define SELECT 352 #define SET 353
#define SET 353 #define SUBSTRING 354
#define SUBSTRING 354 #define TABLE 355
#define TABLE 355 #define TIME 356
#define TIME 356 #define TIMESTAMP 357
#define TIMESTAMP 357 #define TO 358
#define TO 358 #define TRAILING 359
#define TRAILING 359 #define TRANSACTION 360
#define TRANSACTION 360 #define TRIM 361
#define TRIM 361 #define UNION 362
#define UNION 362 #define UNIQUE 363
#define UNIQUE 363 #define UPDATE 364
#define UPDATE 364 #define USING 365
#define USING 365 #define VALUES 366
#define VALUES 366 #define VARCHAR 367
#define VARCHAR 367 #define VARYING 368
#define VARYING 368 #define VIEW 369
#define VIEW 369 #define WHERE 370
#define WHERE 370 #define WITH 371
#define WITH 371 #define WORK 372
#define WORK 372 #define YEAR_P 373
#define YEAR_P 373 #define ZONE 374
#define ZONE 374 #define FALSE_P 375
#define FALSE_P 375 #define TRIGGER 376
#define TRIGGER 376 #define TRUE_P 377
#define TRUE_P 377 #define TYPE_P 378
#define TYPE_P 378 #define ABORT_TRANS 379
#define ABORT_TRANS 379 #define AFTER 380
#define AFTER 380 #define AGGREGATE 381
#define AGGREGATE 381 #define ANALYZE 382
#define ANALYZE 382 #define BACKWARD 383
#define BACKWARD 383 #define BEFORE 384
#define BEFORE 384 #define BINARY 385
#define BINARY 385 #define CLUSTER 386
#define CLUSTER 386 #define COPY 387
#define COPY 387 #define DATABASE 388
#define DATABASE 388 #define DELIMITERS 389
#define DELIMITERS 389 #define DO 390
#define DO 390 #define EACH 391
#define EACH 391 #define EXPLAIN 392
#define EXPLAIN 392 #define EXTEND 393
#define EXTEND 393 #define FORWARD 394
#define FORWARD 394 #define FUNCTION 395
#define FUNCTION 395 #define HANDLER 396
#define HANDLER 396 #define INDEX 397
#define INDEX 397 #define INHERITS 398
#define INHERITS 398 #define INSTEAD 399
#define INSTEAD 399 #define ISNULL 400
#define ISNULL 400 #define LANCOMPILER 401
#define LANCOMPILER 401 #define LISTEN 402
#define LISTEN 402 #define LOAD 403
#define LOAD 403 #define LOCK_P 404
#define LOCK_P 404 #define LOCATION 405
#define LOCATION 405 #define MOVE 406
#define MOVE 406 #define NEW 407
#define NEW 407 #define NONE 408
#define NONE 408 #define NOTHING 409
#define NOTHING 409 #define NOTNULL 410
#define NOTNULL 410 #define OIDS 411
#define OIDS 411 #define OPERATOR 412
#define OPERATOR 412 #define PROCEDURAL 413
#define PROCEDURAL 413 #define RECIPE 414
#define RECIPE 414 #define RENAME 415
#define RENAME 415 #define RESET 416
#define RESET 416 #define RETURNS 417
#define RETURNS 417 #define ROW 418
#define ROW 418 #define RULE 419
#define RULE 419 #define SEQUENCE 420
#define SEQUENCE 420 #define SETOF 421
#define SETOF 421 #define SHOW 422
#define SHOW 422 #define STATEMENT 423
#define STATEMENT 423 #define STDIN 424
#define STDIN 424 #define STDOUT 425
#define STDOUT 425 #define TRUSTED 426
#define TRUSTED 426 #define VACUUM 427
#define VACUUM 427 #define VERBOSE 428
#define VERBOSE 428 #define VERSION 429
#define VERSION 429 #define ARCHIVE 430
#define ARCHIVE 430 #define USER 431
#define USER 431 #define PASSWORD 432
#define PASSWORD 432 #define CREATEDB 433
#define CREATEDB 433 #define NOCREATEDB 434
#define NOCREATEDB 434 #define CREATEUSER 435
#define CREATEUSER 435 #define NOCREATEUSER 436
#define NOCREATEUSER 436 #define VALID 437
#define VALID 437 #define UNTIL 438
#define UNTIL 438 #define IDENT 439
#define IDENT 439 #define SCONST 440
#define SCONST 440 #define Op 441
#define Op 441 #define ICONST 442
#define ICONST 442 #define PARAM 443
#define PARAM 443 #define FCONST 444
#define FCONST 444 #define OP 445
#define OP 445 #define UMINUS 446
#define UMINUS 446 #define TYPECAST 447
#define TYPECAST 447 #define REDUCE 448
#define REDUCE 448
extern YYSTYPE yylval; extern YYSTYPE yylval;

6
src/interfaces/ecpg/lib/Makefile.in
View File

@ -1,7 +1,7 @@
SRCDIR= ../../.. SRCDIR= ../../..
include $(SRCDIR)/Makefile.global include $(SRCDIR)/Makefile.global
PQ_INCLUDE=-I$(SRCDIR)/include -I$(SRCDIR)/interfaces/libpq PQ_INCLUDE=-I$(SRCDIR)/interfaces/libpq
SO_MAJOR_VERSION=1 SO_MAJOR_VERSION=1
SO_MINOR_VERSION=0 SO_MINOR_VERSION=0
@ -61,6 +61,6 @@ uninstall::
libecpg.a : libecpg.a(ecpglib.o) libecpg.a(typename.o) libecpg.a : libecpg.a(ecpglib.o) libecpg.a(typename.o)
ecpglib.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h ecpglib.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
$(CC) -Wall -I../include $(PQ_INCLUDE) -c ecpglib.c $(CC) -I../include $(PQ_INCLUDE) -c ecpglib.c
typename.o : typename.c ../include/ecpgtype.h typename.o : typename.c ../include/ecpgtype.h
$(CC) -Wall -I../include $(PQ_INCLUDE) -c typename.c $(CC) -I../include $(PQ_INCLUDE) -c typename.c

2
src/interfaces/ecpg/preproc/Makefile
View File

@ -5,7 +5,7 @@ MAJOR_VERSION=1
MINOR_VERSION=0 MINOR_VERSION=0
PATCHLEVEL=0 PATCHLEVEL=0
CFLAGS+=-I$(SRCDIR)/include -I../include -Wall -DMAJOR_VERSION=$(MAJOR_VERSION) -DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) -DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL)
all:: ecpg all:: ecpg

9
src/interfaces/libpq/Makefile.in
View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.7 1998/02/24 03:09:47 scrappy Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.8 1998/02/27 02:40:59 scrappy Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -17,12 +17,9 @@ SO_MINOR_VERSION=1
SRCDIR= ../.. SRCDIR= ../..
include $(SRCDIR)/Makefile.global include $(SRCDIR)/Makefile.global
# We need the backend directory here for its fmgr.h
INCLUDE_OPT= -I$(SRCDIR)/include -I$(SRCDIR)/backend
PORTNAME=@PORTNAME@ PORTNAME=@PORTNAME@
CFLAGS+= $(INCLUDE_OPT) -DFRONTEND CFLAGS+=-DFRONTEND
ifdef KRBVERS ifdef KRBVERS
CFLAGS+= $(KRBFLAGS) CFLAGS+= $(KRBFLAGS)
@ -175,7 +172,7 @@ install-shlib: $(shlib)
ln -s $(shlib) $(DESTDIR)$(LIBDIR)/libpq.so ln -s $(shlib) $(DESTDIR)$(LIBDIR)/libpq.so
depend dep: depend dep:
$(CC) -MM $(INCLUDE_OPT) *.c >depend $(CC) -MM *.c >depend
.PHONY: clean .PHONY: clean
clean: clean:

3
src/makefiles/Makefile.aix
View File

@ -2,6 +2,9 @@
# symbol names to tell them what to export/import. # symbol names to tell them what to export/import.
MAKE_EXPORTS= true MAKE_EXPORTS= true
RANLIB= touch
MK_NO_LORDER= true
EXPSUFF= .exp EXPSUFF= .exp
IMPSUFF= .imp IMPSUFF= .imp

8
src/utils/Makefile
View File

@ -4,7 +4,7 @@
# Makefile for utils # Makefile for utils
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/utils/Attic/Makefile,v 1.3 1996/11/26 07:39:11 bryanh Exp $ # $Header: /cvsroot/pgsql/src/utils/Attic/Makefile,v 1.4 1998/02/27 02:41:21 scrappy Exp $
# #
# About strdup: Some systems have strdup in their standard library, others # About strdup: Some systems have strdup in their standard library, others
# don't. Ones that don't will use this make file to compile the strdup.c # don't. Ones that don't will use this make file to compile the strdup.c
@ -18,16 +18,12 @@
SRCDIR = .. SRCDIR = ..
include ../Makefile.global include ../Makefile.global
INCLUDE_OPT = -I../include
CFLAGS+=$(INCLUDE_OPT)
all: version.o all: version.o
install: install:
depend dep: depend dep:
$(CC) -MM $(INCLUDE_OPT) *.c >depend $(CC) -MM *.c >depend
clean: clean:
rm -f version.o rm -f version.o