Changeset 1865

Show
Ignore:
Timestamp:
26.01.2001 13:55:12 (19 years ago)
Author:
jrm21
Message:

removed (some of the) re-inserted deleted stuff from the CORBA merge.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/packages/yaz/Makefile.in

    r1860 r1865  
    1111# PARTICULAR PURPOSE. 
    1212 
     13####### 
     14# Modified for the NZDL Greenstone project. The original is still in 
     15# Makefile.am, for processing with automake. 
     16####### 
    1317 
    1418SHELL = @SHELL@ 
     
    4145top_builddir = . 
    4246 
    43 ACLOCAL = @ACLOCAL@ 
    44 AUTOCONF = @AUTOCONF@ 
    45 AUTOMAKE = @AUTOMAKE@ 
    46 AUTOHEADER = @AUTOHEADER@ 
    47  
    48 INSTALL = @INSTALL@ 
    49 INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) 
    50 INSTALL_DATA = @INSTALL_DATA@ 
    51 INSTALL_SCRIPT = @INSTALL_SCRIPT@ 
    52 transform = @program_transform_name@ 
    53  
    54 NORMAL_INSTALL = : 
    55 PRE_INSTALL = : 
    56 POST_INSTALL = : 
    57 NORMAL_UNINSTALL = : 
    58 PRE_UNINSTALL = : 
    59 POST_UNINSTALL = : 
    6047ASNMODULE = @ASNMODULE@ 
    6148CC = @CC@ 
     
    7259have_sgml2txt = @have_sgml2txt@ 
    7360 
    74 AUTOMAKE_OPTIONS = foreign  
    75  
    7661DIST_SUBDIRS = util odr z39.50 asn ill zutil comstack ccl tab retrieval server lib include client ztest doc 
    7762 
    7863SUBDIRS = @SUBDIRS_VAR@ 
    7964 
    80 noinst_SCRIPTS = yaz-config 
    8165SPEC_FILE = $(PACKAGE).spec 
    8266EXTRA_DIST = $(SPEC_FILE) README LICENSE CHANGELOG TODO windows.txt 
    8367ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    8468mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs 
    85 CONFIG_CLEAN_FILES =  
    86 SCRIPTS =  $(noinst_SCRIPTS) 
     69CONFIG_CLEAN_FILES = config.status config.cache config.log 
    8770 
    8871DIST_COMMON =  Makefile.am Makefile.in TODO aclocal.m4 configure \ 
     
    9275DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) 
    9376 
    94 TAR = gtar 
    95 GZIP_ENV = --best 
    96 all: all-redirect 
    97 .SUFFIXES: 
    98 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)  
    99     cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile 
    10077 
    101 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status 
    102     cd $(top_builddir) \ 
    103       && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status 
    10478 
    105 $(ACLOCAL_M4):  configure.in  
    106     cd $(srcdir) && $(ACLOCAL) 
     79all: all-recursive 
     80# make install should not do anything for greenstone (I hope...) 
     81install: 
     82clean: clean-recursive 
     83distclean: distclean-recursive 
     84    -rm -f Makefile $(CONFIG_CLEAN_FILES) 
    10785 
    108 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) 
    109     $(SHELL) ./config.status --recheck 
    110 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) 
    111     cd $(srcdir) && $(AUTOCONF) 
     86 
     87# Don't want Makefile.in automatically re-generated from Makefile.am... 
     88# 
     89# .SUFFIXES: 
     90# $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
     91#   cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile 
     92# 
     93# Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status 
     94#   cd $(top_builddir) \ 
     95#     && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status 
     96# 
     97# $(ACLOCAL_M4):  configure.in  
     98#   cd $(srcdir) && $(ACLOCAL) 
     99# 
     100# config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) 
     101#   $(SHELL) ./config.status --recheck 
     102# $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) 
     103#   cd $(srcdir) && $(AUTOCONF) 
    112104 
    113105# This directory's subdirectories are mostly independent; you can cd 
     
    118110# (2) otherwise, pass the desired values on the `make' command line. 
    119111 
    120 @SET_MAKE@ 
     112# @SET_MAKE@ 
    121113 
    122 all-recursive install-data-recursive install-exec-recursive \ 
    123 installdirs-recursive install-recursive uninstall-recursive  \ 
    124 check-recursive installcheck-recursive info-recursive dvi-recursive: 
    125     @set fnord $(MAKEFLAGS); amf=$$2; \ 
    126     dot_seen=no; \ 
     114clean-recursive all-recursive: 
     115    set fnord $(MAKEFLAGS); amf=$$2; \ 
    127116    target=`echo $@ | sed s/-recursive//`; \ 
    128117    list='$(SUBDIRS)'; for subdir in $$list; do \ 
    129       echo "Making $$target in $$subdir"; \ 
    130       if test "$$subdir" = "."; then \ 
    131         dot_seen=yes; \ 
    132         local_target="$$target-am"; \ 
    133       else \ 
    134         local_target="$$target"; \ 
    135       fi; \ 
    136       (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ 
     118      (cd $$subdir && $(MAKE) $$target) \ 
    137119       || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ 
    138     done; \ 
    139     if test "$$dot_seen" = "no"; then \ 
    140       $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ 
    141     fi; test -z "$$fail" 
     120    done; 
     121#     echo "Making $$target in $$subdir";  
    142122 
    143 mostlyclean-recursive clean-recursive distclean-recursive \ 
    144 maintainer-clean-recursive: 
    145     @set fnord $(MAKEFLAGS); amf=$$2; \ 
    146     dot_seen=no; \ 
    147     rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ 
    148       rev="$$subdir $$rev"; \ 
    149       test "$$subdir" = "." && dot_seen=yes; \ 
    150     done; \ 
    151     test "$$dot_seen" = "no" && rev=". $$rev"; \ 
    152     target=`echo $@ | sed s/-recursive//`; \ 
    153     for subdir in $$rev; do \ 
    154       echo "Making $$target in $$subdir"; \ 
    155       if test "$$subdir" = "."; then \ 
    156         local_target="$$target-am"; \ 
    157       else \ 
    158         local_target="$$target"; \ 
    159       fi; \ 
    160       (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ 
    161        || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ 
    162     done && test -z "$$fail" 
    163 tags-recursive: 
    164     list='$(SUBDIRS)'; for subdir in $$list; do \ 
    165       test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ 
    166     done 
    167  
    168 tags: TAGS 
    169  
    170 ID: $(HEADERS) $(SOURCES) $(LISP) 
    171     list='$(SOURCES) $(HEADERS)'; \ 
    172     unique=`for i in $$list; do echo $$i; done | \ 
    173       awk '    { files[$$0] = 1; } \ 
    174            END { for (i in files) print i; }'`; \ 
    175     here=`pwd` && cd $(srcdir) \ 
    176       && mkid -f$$here/ID $$unique $(LISP) 
    177  
    178 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP) 
    179     tags=; \ 
    180     here=`pwd`; \ 
    181     list='$(SUBDIRS)'; for subdir in $$list; do \ 
    182    if test "$$subdir" = .; then :; else \ 
    183         test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ 
    184    fi; \ 
    185     done; \ 
    186     list='$(SOURCES) $(HEADERS)'; \ 
    187     unique=`for i in $$list; do echo $$i; done | \ 
    188       awk '    { files[$$0] = 1; } \ 
    189            END { for (i in files) print i; }'`; \ 
    190     test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ 
    191       || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS) 
    192  
    193 mostlyclean-tags: 
    194  
    195 clean-tags: 
    196  
    197 distclean-tags: 
    198     -rm -f TAGS ID 
    199  
    200 maintainer-clean-tags: 
     123distclean-recursive: 
     124    for subdir in $(SUBDIRS); do \ 
     125    (cd $$subdir && test -e Makefile && $(MAKE) distclean); done 
    201126 
    202127distdir = $(PACKAGE)-$(VERSION) 
    203128top_distdir = $(distdir) 
    204129 
    205 # This target untars the dist file and tries a VPATH configuration.  Then 
    206 # it guarantees that the distribution is self-contained by making another 
    207 # tarfile. 
    208 distcheck: dist 
    209     -rm -rf $(distdir) 
    210     GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz 
    211     mkdir $(distdir)/=build 
    212     mkdir $(distdir)/=inst 
    213     dc_install_base=`cd $(distdir)/=inst && pwd`; \ 
    214     cd $(distdir)/=build \ 
    215       && ../configure --srcdir=.. --prefix=$$dc_install_base \ 
    216       && $(MAKE) $(AM_MAKEFLAGS) \ 
    217       && $(MAKE) $(AM_MAKEFLAGS) dvi \ 
    218       && $(MAKE) $(AM_MAKEFLAGS) check \ 
    219       && $(MAKE) $(AM_MAKEFLAGS) install \ 
    220       && $(MAKE) $(AM_MAKEFLAGS) installcheck \ 
    221       && $(MAKE) $(AM_MAKEFLAGS) dist 
    222     -rm -rf $(distdir) 
    223     @banner="$(distdir).tar.gz is ready for distribution"; \ 
    224     dashes=`echo "$$banner" | sed s/./=/g`; \ 
    225     echo "$$dashes"; \ 
    226     echo "$$banner"; \ 
    227     echo "$$dashes" 
    228 dist: distdir 
    229     -chmod -R a+r $(distdir) 
    230     GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) 
    231     -rm -rf $(distdir) 
    232 dist-all: distdir 
    233     -chmod -R a+r $(distdir) 
    234     GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) 
    235     -rm -rf $(distdir) 
    236 distdir: $(DISTFILES) 
    237     -rm -rf $(distdir) 
    238     mkdir $(distdir) 
    239     -chmod 777 $(distdir) 
    240     @for file in $(DISTFILES); do \ 
    241       d=$(srcdir); \ 
    242       if test -d $$d/$$file; then \ 
    243         cp -pr $$d/$$file $(distdir)/$$file; \ 
    244       else \ 
    245         test -f $(distdir)/$$file \ 
    246         || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ 
    247         || cp -p $$d/$$file $(distdir)/$$file || :; \ 
    248       fi; \ 
    249     done 
    250     for subdir in $(DIST_SUBDIRS); do \ 
    251       if test "$$subdir" = .; then :; else \ 
    252         test -d $(distdir)/$$subdir \ 
    253         || mkdir $(distdir)/$$subdir \ 
    254         || exit 1; \ 
    255         chmod 777 $(distdir)/$$subdir; \ 
    256         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ 
    257           || exit 1; \ 
    258       fi; \ 
    259     done 
    260     $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook 
    261 info-am: 
    262 info: info-recursive 
    263 dvi-am: 
    264 dvi: dvi-recursive 
    265 check-am: all-am 
    266 check: check-recursive 
    267 installcheck-am: 
    268 installcheck: installcheck-recursive 
    269 install-exec-am: 
    270 install-exec: install-exec-recursive 
    271130 
    272 install-data-am: 
    273 install-data: install-data-recursive 
    274  
    275 install-am: all-am 
    276     @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am 
    277 install: install-recursive 
    278 uninstall-am: 
    279 uninstall: uninstall-recursive 
    280 all-am: Makefile $(SCRIPTS) 
    281 all-redirect: all-recursive 
    282 install-strip: 
    283     $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install 
    284 installdirs: installdirs-recursive 
    285 installdirs-am: 
    286  
    287  
    288 mostlyclean-generic: 
    289  
    290 clean-generic: 
    291  
    292 distclean-generic: 
    293     -rm -f Makefile $(CONFIG_CLEAN_FILES) 
    294     -rm -f config.cache config.log stamp-h stamp-h[0-9]* 
    295  
    296 maintainer-clean-generic: 
    297 mostlyclean-am:  mostlyclean-tags mostlyclean-generic 
    298  
    299 mostlyclean: mostlyclean-recursive 
    300  
    301 clean-am:  clean-tags clean-generic mostlyclean-am 
    302  
    303 clean: clean-recursive 
    304  
    305 distclean-am:  distclean-tags distclean-generic clean-am 
    306  
    307 distclean: distclean-recursive 
    308     -rm -f config.status 
    309  
    310 maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \ 
    311         distclean-am 
    312     @echo "This command is intended for maintainers to use;" 
    313     @echo "it deletes files that may require special tools to rebuild." 
    314  
    315 maintainer-clean: maintainer-clean-recursive 
    316     -rm -f config.status 
    317  
    318 .PHONY: install-data-recursive uninstall-data-recursive \ 
    319 install-exec-recursive uninstall-exec-recursive installdirs-recursive \ 
    320 uninstalldirs-recursive all-recursive check-recursive \ 
    321 installcheck-recursive info-recursive dvi-recursive \ 
    322 mostlyclean-recursive distclean-recursive clean-recursive \ 
    323 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ 
    324 distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ 
    325 dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ 
    326 install-exec install-data-am install-data install-am install \ 
    327 uninstall-am uninstall all-redirect all-am all installdirs-am \ 
    328 installdirs mostlyclean-generic distclean-generic clean-generic \ 
    329 maintainer-clean-generic clean mostlyclean distclean maintainer-clean 
    330  
     131.PHONY: all install clean distclean \ 
     132    all-recursive distclean-recursive clean-recursive  \ 
     133    distdir top_distdir yaz-config dist-hook rpm 
    331134 
    332135yaz-config: