diff options
| author | Peter Eisentraut | 2001-05-12 19:49:48 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2001-05-12 19:49:48 +0000 |
| commit | d9f55edc2cf704dfa51bdcede9b61ce69aa69234 (patch) | |
| tree | 9f21692880e68abddbde453cec53b4855c7a5035 | |
| parent | b3f66d198005a55dd496de74ac77c768420772f7 (diff) | |
Add provisions for using strdup replacement in the places that still
needed it.
from our fearless Ultrix porter, Alexander Klimov <ask@wisdom.weizmann.ac.il>
| -rw-r--r-- | src/bin/pg_passwd/Makefile | 12 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/Makefile | 8 |
2 files changed, 17 insertions, 3 deletions
diff --git a/src/bin/pg_passwd/Makefile b/src/bin/pg_passwd/Makefile index e14690c0601..f6f4acd0118 100644 --- a/src/bin/pg_passwd/Makefile +++ b/src/bin/pg_passwd/Makefile @@ -1,14 +1,22 @@ -# $Header: /cvsroot/pgsql/src/bin/pg_passwd/Attic/Makefile,v 1.13 2000/11/30 20:36:12 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_passwd/Attic/Makefile,v 1.14 2001/05/12 19:49:47 petere Exp $ subdir = src/bin/pg_passwd top_builddir = ../../.. include $(top_builddir)/src/Makefile.global +OBJS = pg_passwd.o +ifdef STRDUP +OBJS += $(top_builddir)/src/utils/strdup.o +endif + all: pg_passwd -pg_passwd: pg_passwd.o +pg_passwd: $(OBJS) $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@ +$(top_builddir)/src/utils/strdup.o: + $(MAKE) -C $(top_builddir)/src/utils strdup.o + install: all installdirs $(INSTALL_PROGRAM) pg_passwd$(X) $(DESTDIR)$(bindir)/pg_passwd$(X) diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile index 46a47c63bc3..e869987a2dd 100644 --- a/src/interfaces/ecpg/preproc/Makefile +++ b/src/interfaces/ecpg/preproc/Makefile @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.75 2001/05/11 01:46:33 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.76 2001/05/12 19:49:48 petere Exp $ subdir = src/interfaces/ecpg/preproc top_builddir = ../../../.. @@ -25,6 +25,12 @@ $(top_builddir)/src/backend/port/snprintf.o: $(MAKE) -C $(top_builddir)/src/backend/port snprintf.o endif +ifdef STRDUP +OBJS+=$(top_builddir)/src/utils/strdup.o + +$(top_builddir)/src/utils/strdup.o: + $(MAKE) -C $(top_builddir)/src/utils strdup.o +endif ecpg: $(OBJS) $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@ |