Thu May 19 23:26:16 PDT 2005
- Previous message: [Slony1-commit] By cbbrowne: Per Bug Report #1306 by tgoodair...
- Next message: [Slony1-commit] By devrim: Fix unclosed <para> tag
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message: ----------- Clean up some build ommisions. have host_cpu properly detect, as well as have SL_FLAGS understood for building .so's Modified Files: -------------- slony1-engine: GNUmakefile.in (r1.18 -> r1.19) Makefile.global.in (r1.27 -> r1.28) slony1-engine/doc/adminguide: Makefile (r1.11 -> r1.12) slony1-engine/doc/concept: Makefile (r1.9 -> r1.10) slony1-engine/doc/implementation: Makefile (r1.8 -> r1.9) slony1-engine/makefiles: Makefile.freebsd (r1.5 -> r1.6) Makefile.openbsd (r1.5 -> r1.6) slony1-engine/src/backend: Makefile (r1.17 -> r1.18) slony1-engine/src/ducttape: Makefile (r1.8 -> r1.9) slony1-engine/src/slon: Makefile (r1.29 -> r1.30) slony1-engine/src/xxid: Makefile (r1.15 -> r1.16) Added Files: ----------- slony1-engine/doc/implementation: .cvsignore (r1.1) -------------- next part -------------- Index: Makefile.global.in =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/Makefile.global.in,v retrieving revision 1.27 retrieving revision 1.28 diff -LMakefile.global.in -LMakefile.global.in -u -w -r1.27 -r1.28 --- Makefile.global.in +++ Makefile.global.in @@ -23,6 +23,8 @@ sysconfdir= @sysconfdir@ host_os= @HOST_OS@ +host_cpu= @host_cpu@ + PORTNAME= @PORTNAME@ PACKAGE_NAME= @PACKAGE_NAME@ VERSION= @PACKAGE_VERSION@ Index: GNUmakefile.in =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/GNUmakefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -LGNUmakefile.in -LGNUmakefile.in -u -w -r1.18 -r1.19 --- GNUmakefile.in +++ GNUmakefile.in @@ -60,7 +60,7 @@ dist: distdir -chmod -R a+r $(distdir) - $(TAR) chof - @PACKAGE_NAME at -@PACKAGE_VERSION@ | $(GZIP) -c > @PACKAGE_NAME at -@PACKAGE_VERSION at .tar.gz + $(TAR) --exclude */CVS -chof - @PACKAGE_NAME at -@PACKAGE_VERSION@ | $(GZIP) -c > @PACKAGE_NAME at -@PACKAGE_VERSION at .tar.gz -rm -rf $(distdir) distdir: $(DISTFILES) Index: Makefile =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -Ldoc/adminguide/Makefile -Ldoc/adminguide/Makefile -u -w -r1.11 -r1.12 --- doc/adminguide/Makefile +++ doc/adminguide/Makefile @@ -19,6 +19,8 @@ ALLSGML = $(wildcard $(srcdir)/*.sgml) $(GENERATED_SGML) +DISTFILES = $(ALLSGML) $(GENERATED_SGML) + ifdef DOCBOOKSTYLE CATALOG = -c $(DOCBOOKSTYLE)/catalog endif @@ -261,3 +263,11 @@ echo "<!entity version \"$(VERSION)\">"; \ echo "<!entity majorversion \"`expr $(VERSION) : '\([0-9][0-9]*\.[0-9][0-9]*\)'`\">"; \ } >$@ + +distdir: $(DISTFILES) + mkdir -p $(distdir)/$(subdir) + -chmod 777 $(distdir)/$(subdir) + @for file in $(DISTFILES) ; do \ + cp $$file $(distdir)/$(subdir)/$$file ; \ + done + Index: Makefile =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/concept/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -Ldoc/concept/Makefile -Ldoc/concept/Makefile -u -w -r1.9 -r1.10 --- doc/concept/Makefile +++ doc/concept/Makefile @@ -66,10 +66,19 @@ ifdef PNMTOPS $(DJPEG) $< | $(PNMTOPS) -rle -noturn >$@ else + ifdef CONVERT $(CONVERT) $< >$@ || echo "unable to create $@ from $<" + else + @echo "unable to create $@ from $<" + endif endif else + ifdef CONVERT $(CONVERT) $< >$@ || echo "unable to create $@ from $<" + else + @echo "unable to create $@ from $<" + endif + endif %.ps: %.nr --- /dev/null +++ doc/implementation/.cvsignore @@ -0,0 +1,4 @@ +Slon.eps +Slony-I-implementation.pdf +Slony-I-implementation.ps +Slony-I-implementation.txt Index: Makefile =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/implementation/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -Ldoc/implementation/Makefile -Ldoc/implementation/Makefile -u -w -r1.8 -r1.9 --- doc/implementation/Makefile +++ doc/implementation/Makefile @@ -64,10 +64,18 @@ ifdef PNMTOPS $(DJPEG) $< | $(PNMTOPS) -rle -noturn >$@ else + ifdef CONVERT $(CONVERT) $< >$@ || echo "unable to create $@ from $<" + else + @echo "unable to create $@ from $<" + endif endif else + ifdef CONVERT $(CONVERT) $< >$@ || echo "unable to create $@ from $<" + else + @echo "unable to create $@ from $<" + endif endif %.ps: %.nr Index: Makefile.freebsd =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/makefiles/Makefile.freebsd,v retrieving revision 1.5 retrieving revision 1.6 diff -Lmakefiles/Makefile.freebsd -Lmakefiles/Makefile.freebsd -u -w -r1.5 -r1.6 --- makefiles/Makefile.freebsd +++ makefiles/Makefile.freebsd @@ -1,13 +1,18 @@ AROPT = cr ifdef ELF_SYSTEM -export_dynamic = -export-dynamic -rpath = -R$(pglibdir) -shlib_symbolic = -Wl,-Bsymbolic -lc +export_dynamic = -Wl,-export-dynamic +rpath = -Wl,-R$(pglibdir) endif DLSUFFIX = .so + +ifeq ($(findstring sparc,$(host_cpu)), sparc) +CFLAGS_SL = -fPIC -DPIC +else CFLAGS_SL = -fpic -DPIC +endif + %.so: %.o ifdef ELF_SYSTEM Index: Makefile.openbsd =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/makefiles/Makefile.openbsd,v retrieving revision 1.5 retrieving revision 1.6 diff -Lmakefiles/Makefile.openbsd -Lmakefiles/Makefile.openbsd -u -w -r1.5 -r1.6 --- makefiles/Makefile.openbsd +++ makefiles/Makefile.openbsd @@ -7,7 +7,12 @@ endif DLSUFFIX = .so + +ifeq ($(findstring sparc,$(host_cpu)), sparc) +CFLAGS_SL = -fPIC -DPIC +else CFLAGS_SL = -fpic -DPIC +endif %.so: %.o ifdef ELF_SYSTEM Index: Makefile =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/backend/Makefile,v retrieving revision 1.17 retrieving revision 1.18 diff -Lsrc/backend/Makefile -Lsrc/backend/Makefile -u -w -r1.17 -r1.18 --- src/backend/Makefile +++ src/backend/Makefile @@ -10,7 +10,8 @@ slony_subdir = src/backend slony_top_builddir = ../.. include $(slony_top_builddir)/Makefile.global -override CFLAGS += -I$(slony_top_builddir) + +override CFLAGS += -I$(slony_top_builddir) $(CFLAGS_SL) NAME = slony1_funcs Index: Makefile =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -Lsrc/ducttape/Makefile -Lsrc/ducttape/Makefile -u -w -r1.8 -r1.9 --- src/ducttape/Makefile +++ src/ducttape/Makefile @@ -11,8 +11,8 @@ slony_top_builddir = ../.. include $(slony_top_builddir)/Makefile.global -DISTFILES = Makefile README test_1_pgbench test_2_extra_1 test_2_extra_2 test_2_pgbench test_3_pgbench - +TESTS = $(wildcard test_[0-9A-F]_*) +DISTFILES = Makefile README $(TESTS) ALL = @@ -28,7 +28,10 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) - +test: + for script in $(TESTS) ; do \ + ./$$script ; \ + done distdir: $(DISTFILES) mkdir $(distdir)/$(subdir) Index: Makefile =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/Makefile,v retrieving revision 1.29 retrieving revision 1.30 diff -Lsrc/slon/Makefile -Lsrc/slon/Makefile -u -w -r1.29 -r1.30 --- src/slon/Makefile +++ src/slon/Makefile @@ -43,7 +43,7 @@ endif -DISTFILES = Makefile README $(wildcard *.c) $(wildcard *.h) +DISTFILES = Makefile README $(wildcard *.c) $(wildcard *.h) $(wildcard *.l) $(wildcard *.y) ALL = \ $(PROG) Index: Makefile =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/xxid/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -Lsrc/xxid/Makefile -Lsrc/xxid/Makefile -u -w -r1.15 -r1.16 --- src/xxid/Makefile +++ src/xxid/Makefile @@ -10,6 +10,7 @@ slony_subdir = src/xxid slony_top_builddir = ../.. include $(slony_top_builddir)/Makefile.global +override CFLAGS += $(CFLAGS_SL) NAME = xxid
- Previous message: [Slony1-commit] By cbbrowne: Per Bug Report #1306 by tgoodair...
- Next message: [Slony1-commit] By devrim: Fix unclosed <para> tag
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list