diff options
| author | Peter Eisentraut | 2002-07-27 20:10:05 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2002-07-27 20:10:05 +0000 |
| commit | b0c3c48eb3779d9637a03c455f3934d9d7c08030 (patch) | |
| tree | 4fbf5c8d94ae2534735e1b7935edb40d6205cc44 /src/backend/Makefile | |
| parent | c3fdf8925ed7fbb3017be052e0700c51ceb12e0b (diff) | |
Assemble portability modules into libpgport library.
Some makefile simplifications.
Diffstat (limited to 'src/backend/Makefile')
| -rw-r--r-- | src/backend/Makefile | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile index 925340c3b19..dcfa3cad39b 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.81 2002/07/18 02:02:29 ishii Exp $ +# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.82 2002/07/27 20:10:04 petere Exp $ # #------------------------------------------------------------------------- @@ -29,7 +29,7 @@ endif ########################################################################## -all: postgres $(POSTGRES_IMP) +all: submake-libpgport postgres $(POSTGRES_IMP) ifeq ($(enable_nls), yes) $(MAKE) -C po all endif @@ -41,13 +41,11 @@ postgres: $(OBJS) else # win -# No points for style here. How about encapsulating some of these -# commands into variables? postgres: $(OBJS) $(DLLINIT) postgres.def libpostgres.a - dlltool --dllname $@$(X) --output-exp $@.exp --def postgres.def - gcc $(LDFLAGS) -g -o $@$(X) -Wl,--base-file,$@.base $@.exp $(OBJS) $(DLLLIBS) - dlltool --dllname $@$(X) --base-file $@.base --output-exp $@.exp --def postgres.def - gcc $(LDFLAGS) -g -o $@$(X) $@.exp $(OBJS) $(DLLLIBS) + $(DLLTOOL) --dllname $@$(X) --output-exp $@.exp --def postgres.def + $(CC) $(LDFLAGS) -o $@$(X) -Wl,--base-file,$@.base $@.exp $(OBJS) $(DLLLIBS) + $(DLLTOOL) --dllname $@$(X) --base-file $@.base --output-exp $@.exp --def postgres.def + $(CC) $(LDFLAGS) -o $@$(X) $@.exp $(OBJS) $(DLLLIBS) rm $@.exp $@.base endif # win @@ -73,7 +71,7 @@ libpostgres.a: $(OBJS) $(DLLINIT) postgres.def endif # MAKE_DLL -$(DLLINIT): +$(DLLINIT): $(DLLINIT:%.o=%.c) $(MAKE) -C $(@D) $(@F) # The postgres.o target is needed by the rule in Makefile.global that |