From 296a942b56e17b9d73136900a2e692f4debd8b01 Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Fri, 27 Feb 1998 02:41:21 +0000 Subject: [PATCH] From: Darren King 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. --- src/backend/parser/gram.c | 4 +- src/backend/parser/parse.h | 431 +++++++++++++-------------- src/interfaces/ecpg/lib/Makefile.in | 6 +- src/interfaces/ecpg/preproc/Makefile | 2 +- src/interfaces/libpq/Makefile.in | 9 +- src/makefiles/Makefile.aix | 3 + src/utils/Makefile | 8 +- 7 files changed, 229 insertions(+), 234 deletions(-) diff --git a/src/backend/parser/gram.c b/src/backend/parser/gram.c index cbf49d2b60..9866cd634f 100644 --- a/src/backend/parser/gram.c +++ b/src/backend/parser/gram.c @@ -210,7 +210,7 @@ * * * 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 * AUTHOR DATE MAJOR EVENT @@ -287,7 +287,7 @@ typedef union char chr; char *str; bool boolean; - bool* pboolean; /* for pg_user privileges */ + bool* pboolean; /* for pg_shadow privileges */ List *list; Node *node; Value *value; diff --git a/src/backend/parser/parse.h b/src/backend/parser/parse.h index 1bf37f80bf..60a5c83d66 100644 --- a/src/backend/parser/parse.h +++ b/src/backend/parser/parse.h @@ -1,225 +1,224 @@ typedef union { - double dval; - int ival; - char chr; - char *str; - bool boolean; - bool *pboolean; /* for pg_user privileges */ - List *list; - Node *node; - Value *value; + double dval; + int ival; + char chr; + char *str; + bool boolean; + bool* pboolean; /* for pg_shadow privileges */ + List *list; + Node *node; + Value *value; - Attr *attr; + Attr *attr; - TypeName *typnam; - DefElem *defelt; - ParamString *param; - SortGroupBy *sortgroupby; - IndexElem *ielem; - RangeVar *range; - RelExpr *relexp; - A_Indices *aind; - ResTarget *target; - ParamNo *paramno; + TypeName *typnam; + DefElem *defelt; + ParamString *param; + SortGroupBy *sortgroupby; + IndexElem *ielem; + RangeVar *range; + RelExpr *relexp; + A_Indices *aind; + ResTarget *target; + ParamNo *paramno; - VersionStmt *vstmt; - DefineStmt *dstmt; - RuleStmt *rstmt; - InsertStmt *astmt; + VersionStmt *vstmt; + DefineStmt *dstmt; + RuleStmt *rstmt; + InsertStmt *astmt; } YYSTYPE; - -#define ACTION 258 -#define ADD 259 -#define ALL 260 -#define ALTER 261 -#define AND 262 -#define ANY 263 -#define AS 264 -#define ASC 265 -#define BEGIN_TRANS 266 -#define BETWEEN 267 -#define BOTH 268 -#define BY 269 -#define CASCADE 270 -#define CAST 271 -#define CHAR 272 -#define CHARACTER 273 -#define CHECK 274 -#define CLOSE 275 -#define COLLATE 276 -#define COLUMN 277 -#define COMMIT 278 -#define CONSTRAINT 279 -#define CREATE 280 -#define CROSS 281 -#define CURRENT 282 -#define CURRENT_DATE 283 -#define CURRENT_TIME 284 -#define CURRENT_TIMESTAMP 285 -#define CURRENT_USER 286 -#define CURSOR 287 -#define DAY_P 288 -#define DECIMAL 289 -#define DECLARE 290 -#define DEFAULT 291 -#define DELETE 292 -#define DESC 293 -#define DISTINCT 294 -#define DOUBLE 295 -#define DROP 296 -#define END_TRANS 297 -#define EXECUTE 298 -#define EXISTS 299 -#define EXTRACT 300 -#define FETCH 301 -#define FLOAT 302 -#define FOR 303 -#define FOREIGN 304 -#define FROM 305 -#define FULL 306 -#define GRANT 307 -#define GROUP 308 -#define HAVING 309 -#define HOUR_P 310 -#define IN 311 -#define INNER_P 312 -#define INSERT 313 -#define INTERVAL 314 -#define INTO 315 -#define IS 316 -#define JOIN 317 -#define KEY 318 -#define LANGUAGE 319 -#define LEADING 320 -#define LEFT 321 -#define LIKE 322 -#define LOCAL 323 -#define MATCH 324 -#define MINUTE_P 325 -#define MONTH_P 326 -#define NATIONAL 327 -#define NATURAL 328 -#define NCHAR 329 -#define NO 330 -#define NOT 331 -#define NOTIFY 332 -#define NULL_P 333 -#define NUMERIC 334 -#define ON 335 -#define OPTION 336 -#define OR 337 -#define ORDER 338 -#define OUTER_P 339 -#define PARTIAL 340 -#define POSITION 341 -#define PRECISION 342 -#define PRIMARY 343 -#define PRIVILEGES 344 -#define PROCEDURE 345 -#define PUBLIC 346 -#define REFERENCES 347 -#define REVOKE 348 -#define RIGHT 349 -#define ROLLBACK 350 -#define SECOND_P 351 -#define SELECT 352 -#define SET 353 -#define SUBSTRING 354 -#define TABLE 355 -#define TIME 356 -#define TIMESTAMP 357 -#define TO 358 -#define TRAILING 359 -#define TRANSACTION 360 -#define TRIM 361 -#define UNION 362 -#define UNIQUE 363 -#define UPDATE 364 -#define USING 365 -#define VALUES 366 -#define VARCHAR 367 -#define VARYING 368 -#define VIEW 369 -#define WHERE 370 -#define WITH 371 -#define WORK 372 -#define YEAR_P 373 -#define ZONE 374 -#define FALSE_P 375 -#define TRIGGER 376 -#define TRUE_P 377 -#define TYPE_P 378 -#define ABORT_TRANS 379 -#define AFTER 380 -#define AGGREGATE 381 -#define ANALYZE 382 -#define BACKWARD 383 -#define BEFORE 384 -#define BINARY 385 -#define CLUSTER 386 -#define COPY 387 -#define DATABASE 388 -#define DELIMITERS 389 -#define DO 390 -#define EACH 391 -#define EXPLAIN 392 -#define EXTEND 393 -#define FORWARD 394 -#define FUNCTION 395 -#define HANDLER 396 -#define INDEX 397 -#define INHERITS 398 -#define INSTEAD 399 -#define ISNULL 400 -#define LANCOMPILER 401 -#define LISTEN 402 -#define LOAD 403 -#define LOCK_P 404 -#define LOCATION 405 -#define MOVE 406 -#define NEW 407 -#define NONE 408 -#define NOTHING 409 -#define NOTNULL 410 -#define OIDS 411 -#define OPERATOR 412 -#define PROCEDURAL 413 -#define RECIPE 414 -#define RENAME 415 -#define RESET 416 -#define RETURNS 417 -#define ROW 418 -#define RULE 419 -#define SEQUENCE 420 -#define SETOF 421 -#define SHOW 422 -#define STATEMENT 423 -#define STDIN 424 -#define STDOUT 425 -#define TRUSTED 426 -#define VACUUM 427 -#define VERBOSE 428 -#define VERSION 429 -#define ARCHIVE 430 -#define USER 431 -#define PASSWORD 432 -#define CREATEDB 433 -#define NOCREATEDB 434 -#define CREATEUSER 435 -#define NOCREATEUSER 436 -#define VALID 437 -#define UNTIL 438 -#define IDENT 439 -#define SCONST 440 -#define Op 441 -#define ICONST 442 -#define PARAM 443 -#define FCONST 444 -#define OP 445 -#define UMINUS 446 -#define TYPECAST 447 -#define REDUCE 448 +#define ACTION 258 +#define ADD 259 +#define ALL 260 +#define ALTER 261 +#define AND 262 +#define ANY 263 +#define AS 264 +#define ASC 265 +#define BEGIN_TRANS 266 +#define BETWEEN 267 +#define BOTH 268 +#define BY 269 +#define CASCADE 270 +#define CAST 271 +#define CHAR 272 +#define CHARACTER 273 +#define CHECK 274 +#define CLOSE 275 +#define COLLATE 276 +#define COLUMN 277 +#define COMMIT 278 +#define CONSTRAINT 279 +#define CREATE 280 +#define CROSS 281 +#define CURRENT 282 +#define CURRENT_DATE 283 +#define CURRENT_TIME 284 +#define CURRENT_TIMESTAMP 285 +#define CURRENT_USER 286 +#define CURSOR 287 +#define DAY_P 288 +#define DECIMAL 289 +#define DECLARE 290 +#define DEFAULT 291 +#define DELETE 292 +#define DESC 293 +#define DISTINCT 294 +#define DOUBLE 295 +#define DROP 296 +#define END_TRANS 297 +#define EXECUTE 298 +#define EXISTS 299 +#define EXTRACT 300 +#define FETCH 301 +#define FLOAT 302 +#define FOR 303 +#define FOREIGN 304 +#define FROM 305 +#define FULL 306 +#define GRANT 307 +#define GROUP 308 +#define HAVING 309 +#define HOUR_P 310 +#define IN 311 +#define INNER_P 312 +#define INSERT 313 +#define INTERVAL 314 +#define INTO 315 +#define IS 316 +#define JOIN 317 +#define KEY 318 +#define LANGUAGE 319 +#define LEADING 320 +#define LEFT 321 +#define LIKE 322 +#define LOCAL 323 +#define MATCH 324 +#define MINUTE_P 325 +#define MONTH_P 326 +#define NATIONAL 327 +#define NATURAL 328 +#define NCHAR 329 +#define NO 330 +#define NOT 331 +#define NOTIFY 332 +#define NULL_P 333 +#define NUMERIC 334 +#define ON 335 +#define OPTION 336 +#define OR 337 +#define ORDER 338 +#define OUTER_P 339 +#define PARTIAL 340 +#define POSITION 341 +#define PRECISION 342 +#define PRIMARY 343 +#define PRIVILEGES 344 +#define PROCEDURE 345 +#define PUBLIC 346 +#define REFERENCES 347 +#define REVOKE 348 +#define RIGHT 349 +#define ROLLBACK 350 +#define SECOND_P 351 +#define SELECT 352 +#define SET 353 +#define SUBSTRING 354 +#define TABLE 355 +#define TIME 356 +#define TIMESTAMP 357 +#define TO 358 +#define TRAILING 359 +#define TRANSACTION 360 +#define TRIM 361 +#define UNION 362 +#define UNIQUE 363 +#define UPDATE 364 +#define USING 365 +#define VALUES 366 +#define VARCHAR 367 +#define VARYING 368 +#define VIEW 369 +#define WHERE 370 +#define WITH 371 +#define WORK 372 +#define YEAR_P 373 +#define ZONE 374 +#define FALSE_P 375 +#define TRIGGER 376 +#define TRUE_P 377 +#define TYPE_P 378 +#define ABORT_TRANS 379 +#define AFTER 380 +#define AGGREGATE 381 +#define ANALYZE 382 +#define BACKWARD 383 +#define BEFORE 384 +#define BINARY 385 +#define CLUSTER 386 +#define COPY 387 +#define DATABASE 388 +#define DELIMITERS 389 +#define DO 390 +#define EACH 391 +#define EXPLAIN 392 +#define EXTEND 393 +#define FORWARD 394 +#define FUNCTION 395 +#define HANDLER 396 +#define INDEX 397 +#define INHERITS 398 +#define INSTEAD 399 +#define ISNULL 400 +#define LANCOMPILER 401 +#define LISTEN 402 +#define LOAD 403 +#define LOCK_P 404 +#define LOCATION 405 +#define MOVE 406 +#define NEW 407 +#define NONE 408 +#define NOTHING 409 +#define NOTNULL 410 +#define OIDS 411 +#define OPERATOR 412 +#define PROCEDURAL 413 +#define RECIPE 414 +#define RENAME 415 +#define RESET 416 +#define RETURNS 417 +#define ROW 418 +#define RULE 419 +#define SEQUENCE 420 +#define SETOF 421 +#define SHOW 422 +#define STATEMENT 423 +#define STDIN 424 +#define STDOUT 425 +#define TRUSTED 426 +#define VACUUM 427 +#define VERBOSE 428 +#define VERSION 429 +#define ARCHIVE 430 +#define USER 431 +#define PASSWORD 432 +#define CREATEDB 433 +#define NOCREATEDB 434 +#define CREATEUSER 435 +#define NOCREATEUSER 436 +#define VALID 437 +#define UNTIL 438 +#define IDENT 439 +#define SCONST 440 +#define Op 441 +#define ICONST 442 +#define PARAM 443 +#define FCONST 444 +#define OP 445 +#define UMINUS 446 +#define TYPECAST 447 +#define REDUCE 448 extern YYSTYPE yylval; diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in index 19a32d8c42..9917d169c2 100644 --- a/src/interfaces/ecpg/lib/Makefile.in +++ b/src/interfaces/ecpg/lib/Makefile.in @@ -1,7 +1,7 @@ SRCDIR= ../../.. include $(SRCDIR)/Makefile.global -PQ_INCLUDE=-I$(SRCDIR)/include -I$(SRCDIR)/interfaces/libpq +PQ_INCLUDE=-I$(SRCDIR)/interfaces/libpq SO_MAJOR_VERSION=1 SO_MINOR_VERSION=0 @@ -61,6 +61,6 @@ uninstall:: libecpg.a : libecpg.a(ecpglib.o) libecpg.a(typename.o) 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 - $(CC) -Wall -I../include $(PQ_INCLUDE) -c typename.c + $(CC) -I../include $(PQ_INCLUDE) -c typename.c diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile index c6438be232..92d3e8b390 100644 --- a/src/interfaces/ecpg/preproc/Makefile +++ b/src/interfaces/ecpg/preproc/Makefile @@ -5,7 +5,7 @@ MAJOR_VERSION=1 MINOR_VERSION=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 diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in index df0793db11..9b8de869aa 100644 --- a/src/interfaces/libpq/Makefile.in +++ b/src/interfaces/libpq/Makefile.in @@ -7,7 +7,7 @@ # # # 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= ../.. include $(SRCDIR)/Makefile.global -# We need the backend directory here for its fmgr.h -INCLUDE_OPT= -I$(SRCDIR)/include -I$(SRCDIR)/backend - PORTNAME=@PORTNAME@ -CFLAGS+= $(INCLUDE_OPT) -DFRONTEND +CFLAGS+=-DFRONTEND ifdef KRBVERS CFLAGS+= $(KRBFLAGS) @@ -175,7 +172,7 @@ install-shlib: $(shlib) ln -s $(shlib) $(DESTDIR)$(LIBDIR)/libpq.so depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM *.c >depend .PHONY: clean clean: diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix index 2b99a28f88..603adaa147 100644 --- a/src/makefiles/Makefile.aix +++ b/src/makefiles/Makefile.aix @@ -2,6 +2,9 @@ # symbol names to tell them what to export/import. MAKE_EXPORTS= true +RANLIB= touch +MK_NO_LORDER= true + EXPSUFF= .exp IMPSUFF= .imp diff --git a/src/utils/Makefile b/src/utils/Makefile index 16957f2b4b..c695b56988 100644 --- a/src/utils/Makefile +++ b/src/utils/Makefile @@ -4,7 +4,7 @@ # Makefile for utils # # 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 # don't. Ones that don't will use this make file to compile the strdup.c @@ -18,16 +18,12 @@ SRCDIR = .. include ../Makefile.global -INCLUDE_OPT = -I../include - -CFLAGS+=$(INCLUDE_OPT) - all: version.o install: depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM *.c >depend clean: rm -f version.o