From: <bal...@us...> - 2003-11-22 19:50:38
|
Update of /cvsroot/gemrb/gemrb/gemrb/plugins/KEYImporter In directory sc8-pr-cvs1:/tmp/cvs-serv18246/gemrb/plugins/KEYImporter Modified Files: Makefile Makefile.in Log Message: Global Linux MakeFiles Update Index: Makefile =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/KEYImporter/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile 25 Oct 2003 15:52:08 -0000 1.9 --- Makefile 22 Nov 2003 19:50:04 -0000 1.10 *************** *** 1,4 **** # Generated automatically from Makefile.in by config.pl. ! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. --- 1,5 ---- # Generated automatically from Makefile.in by config.pl. ! # KDE tags expanded automatically by am_edit - $Revision$ ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. *************** *** 22,25 **** --- 23,30 ---- prefix = /usr/local exec_prefix = ${prefix} + #>- + bindir = ${exec_prefix}/bin + #>+ 3 + DEPDIR = .deps bindir = ${exec_prefix}/bin *************** *** 45,51 **** ACLOCAL = aclocal-1.4 ! AUTOCONF = /home/mud/bg2/gemrb/admin/missing autoconf AUTOMAKE = automake-1.4 ! AUTOHEADER = /home/mud/bg2/gemrb/admin/missing autoheader INSTALL = /usr//bin/install -c -p --- 50,56 ---- ACLOCAL = aclocal-1.4 ! AUTOCONF = autoconf AUTOMAKE = automake-1.4 ! AUTOHEADER = autoheader INSTALL = /usr//bin/install -c -p *************** *** 61,70 **** PRE_UNINSTALL = : POST_UNINSTALL = : ! build_alias = i686-pc-linux-gnu ! build_triplet = i686-pc-linux-gnu ! host_alias = i686-pc-linux-gnu ! host_triplet = i686-pc-linux-gnu ! target_alias = i686-pc-linux-gnu ! target_triplet = i686-pc-linux-gnu ARTSCCONFIG = @ARTSCCONFIG@ AS = @AS@ --- 66,75 ---- PRE_UNINSTALL = : POST_UNINSTALL = : ! build_alias = i386-linux ! build_triplet = i386-pc-linux-gnu ! host_alias = i386-linux ! host_triplet = i386-pc-linux-gnu ! target_alias = i386-linux ! target_triplet = i386-pc-linux-gnu ARTSCCONFIG = @ARTSCCONFIG@ AS = @AS@ *************** *** 156,161 **** MOC = @MOC@ MSGFMT = @MSGFMT@ ! NOOPT_CFLAGS = ! NOOPT_CXXFLAGS = -fno-exceptions -fno-check-new NOREPO = -fno-repo OBJDUMP = @OBJDUMP@ --- 161,166 ---- MOC = @MOC@ MSGFMT = @MSGFMT@ ! NOOPT_CFLAGS = -ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -g ! NOOPT_CXXFLAGS = -Wnon-virtual-dtor -Wno-long-long -Wbad-function-cast -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -fno-builtin -g -g3 -Wall -fno-exceptions -fno-check-new NOREPO = -fno-repo OBJDUMP = @OBJDUMP@ *************** *** 184,188 **** USE_THREADS = @USE_THREADS@ VERSION = 0.1 ! WOVERLOADED_VIRTUAL = XGETTEXT = @XGETTEXT@ XPMINC = @XPMINC@ --- 189,193 ---- USE_THREADS = @USE_THREADS@ VERSION = 0.1 ! WOVERLOADED_VIRTUAL = -Woverloaded-virtual XGETTEXT = @XGETTEXT@ XPMINC = @XPMINC@ *************** *** 231,235 **** libKEYImporter_la_LDFLAGS = -version-info 0:0:0 -L../Core -lcore -ldl ! libKEYImporter_la_METASOURCES = AUTO libKEYImporter_la_SOURCES = Dictionary.cpp KEYImporter.cpp KeyImp.cpp KEYImpCD.cpp --- 236,240 ---- libKEYImporter_la_LDFLAGS = -version-info 0:0:0 -L../Core -lcore -ldl ! #>- libKEYImporter_la_METASOURCES = AUTO libKEYImporter_la_SOURCES = Dictionary.cpp KEYImporter.cpp KeyImp.cpp KEYImpCD.cpp *************** *** 246,256 **** LIBS = libKEYImporter_la_LIBADD = ! libKEYImporter_la_OBJECTS = Dictionary.lo KEYImporter.lo KeyImp.lo \ ! KEYImpCD.lo ! CXXFLAGS = -O2 -fno-exceptions -fno-check-new ! CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in --- 251,273 ---- LIBS = libKEYImporter_la_LIBADD = ! #>- libKEYImporter_la_OBJECTS = Dictionary.lo KEYImporter.lo KeyImp.lo \ ! #>- KEYImpCD.lo ! #>+ 5 ! libKEYImporter_la_final_OBJECTS = libKEYImporter_la.all_cpp.lo ! libKEYImporter_la_nofinal_OBJECTS = Dictionary.lo KEYImporter.lo KeyImp.lo \ ! KEYImpCD.lo ! libKEYImporter_la_OBJECTS = $(libKEYImporter_la_nofinal_OBJECTS) ! #libKEYImporter_la_OBJECTS = $(libKEYImporter_la_final_OBJECTS) ! CXXFLAGS = -Wnon-virtual-dtor -Wno-long-long -Wbad-function-cast -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -fno-builtin -g -O2 -O0 -g3 -Wall -fno-exceptions -fno-check-new ! #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! #>+ 1 ! CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) ! #>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! #>+ 1 ! LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) CXXLD = $(CXX) ! #>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ ! #>+ 1 ! CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in *************** *** 260,277 **** TAR = gtar GZIP_ENV = --best ! DEP_FILES = .deps/Dictionary.P .deps/KEYImpCD.P .deps/KEYImporter.P \ ! .deps/KeyImp.P SOURCES = $(libKEYImporter_la_SOURCES) OBJECTS = $(libKEYImporter_la_OBJECTS) ! all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .cpp .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu gemrb/plugins/KEYImporter/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status --- 277,306 ---- TAR = gtar GZIP_ENV = --best ! #>- DEP_FILES = .deps/Dictionary.P .deps/KEYImpCD.P .deps/KEYImporter.P \ ! #>- .deps/KeyImp.P ! #>+ 6 ! #DEP_FILES = $(DEPDIR)/libKEYImporter_la.all_cpp.P \ ! .deps/Dictionary.P .deps/KEYImpCD.P .deps/KEYImporter.P \ ! .deps/KeyImp.P ! DEP_FILES = .deps/Dictionary.P .deps/KEYImpCD.P .deps/KEYImporter.P \ ! .deps/KeyImp.P ! SOURCES = $(libKEYImporter_la_SOURCES) OBJECTS = $(libKEYImporter_la_OBJECTS) ! #>- all: all-redirect ! #>+ 1 ! all: docs-am all-redirect .SUFFIXES: .SUFFIXES: .S .c .cpp .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + #>- cd $(top_srcdir) && $(AUTOMAKE) --gnu gemrb/plugins/KEYImporter/Makefile + #>+ 2 cd $(top_srcdir) && $(AUTOMAKE) --gnu gemrb/plugins/KEYImporter/Makefile + cd $(top_srcdir) && perl admin/am_edit gemrb/plugins/KEYImporter/Makefile.in Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status *************** *** 289,296 **** $(mkinstalldirs) $(DESTDIR)$(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! if test -f $$p; then \ ! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ ! else :; fi; \ done --- 318,325 ---- $(mkinstalldirs) $(DESTDIR)$(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! if test -f $$p; then \ ! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ ! else :; fi; \ done *************** *** 298,302 **** @$(NORMAL_UNINSTALL) list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done --- 327,331 ---- @$(NORMAL_UNINSTALL) list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done *************** *** 353,360 **** list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) --- 382,389 ---- list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) *************** *** 363,370 **** list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: --- 392,399 ---- list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: *************** *** 386,399 **** distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ ! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu gemrb/plugins/KEYImporter/Makefile @for file in $(DISTFILES); do \ ! d=$(srcdir); \ ! if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ ! else \ ! test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ ! fi; \ done --- 415,428 ---- distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ ! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu gemrb/plugins/KEYImporter/Makefile @for file in $(DISTFILES); do \ ! d=$(srcdir); \ ! if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ ! else \ ! test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ ! fi; \ done *************** *** 416,421 **** @-cp .deps/$(*F).pp .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ rm .deps/$(*F).pp --- 445,450 ---- @-cp .deps/$(*F).pp .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ rm .deps/$(*F).pp *************** *** 424,431 **** $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ! < .deps/$(*F).pp > .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ rm -f .deps/$(*F).pp --- 453,460 ---- $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ! < .deps/$(*F).pp > .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ rm -f .deps/$(*F).pp *************** *** 435,440 **** @-cp .deps/$(*F).pp .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ rm .deps/$(*F).pp --- 464,469 ---- @-cp .deps/$(*F).pp .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ rm .deps/$(*F).pp *************** *** 443,450 **** $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ! < .deps/$(*F).pp > .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ rm -f .deps/$(*F).pp info-am: --- 472,479 ---- $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ! < .deps/$(*F).pp > .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ rm -f .deps/$(*F).pp info-am: *************** *** 485,501 **** maintainer-clean-generic: mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ ! mostlyclean-generic mostlyclean: mostlyclean-am ! clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ ! clean-depend clean-generic mostlyclean-am ! clean: clean-am distclean-am: distclean-libLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-depend \ ! distclean-generic clean-am -rm -f libtool --- 514,535 ---- maintainer-clean-generic: mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ ! mostlyclean-generic mostlyclean: mostlyclean-am ! #>- clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ ! #>- clean-depend clean-generic mostlyclean-am ! #>+ 2 ! clean-am: clean-final clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ ! clean-depend clean-generic mostlyclean-am ! #>- clean: clean-am ! #>+ 1 ! clean: kde-rpo-clean clean-am distclean-am: distclean-libLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-depend \ ! distclean-generic clean-am -rm -f libtool *************** *** 503,509 **** maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ ! maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-depend \ ! maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." --- 537,543 ---- maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ ! maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-depend \ ! maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." *************** *** 512,527 **** .PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ ! clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ ! uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ ! distclean-compile clean-compile maintainer-clean-compile \ ! mostlyclean-libtool distclean-libtool clean-libtool \ ! maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ ! clean-tags maintainer-clean-tags distdir mostlyclean-depend \ ! distclean-depend clean-depend maintainer-clean-depend info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean --- 546,561 ---- .PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ ! clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ ! uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ ! distclean-compile clean-compile maintainer-clean-compile \ ! mostlyclean-libtool distclean-libtool clean-libtool \ ! maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ ! clean-tags maintainer-clean-tags distdir mostlyclean-depend \ ! distclean-depend clean-depend maintainer-clean-depend info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean *************** *** 531,532 **** --- 565,611 ---- # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: + + #>+ 2 + docs-am: + + #>+ 5 + force-reedit: + cd $(top_srcdir) && $(AUTOMAKE) --gnu gemrb/plugins/KEYImporter/Makefile + cd $(top_srcdir) && perl admin/am_edit gemrb/plugins/KEYImporter/Makefile.in + + + #>+ 11 + libKEYImporter_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Dictionary.cpp $(srcdir)/KEYImporter.cpp $(srcdir)/KeyImp.cpp $(srcdir)/KEYImpCD.cpp + @echo 'creating libKEYImporter_la.all_cpp.cpp ...'; \ + rm -f libKEYImporter_la.all_cpp.files libKEYImporter_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libKEYImporter_la.all_cpp.final; \ + for file in Dictionary.cpp KEYImporter.cpp KeyImp.cpp KEYImpCD.cpp ; do \ + echo "#include \"$$file\"" >> libKEYImporter_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libKEYImporter_la.all_cpp.final; \ + done; \ + cat libKEYImporter_la.all_cpp.final libKEYImporter_la.all_cpp.files > libKEYImporter_la.all_cpp.cpp; \ + rm -f libKEYImporter_la.all_cpp.final libKEYImporter_la.all_cpp.files + + #>+ 3 + clean-final: + -rm -f libKEYImporter_la.all_cpp.cpp + + #>+ 2 + final: + $(MAKE) libKEYImporter_la_OBJECTS="$(libKEYImporter_la_final_OBJECTS)" all-am + #>+ 2 + final-install: + $(MAKE) libKEYImporter_la_OBJECTS="$(libKEYImporter_la_final_OBJECTS)" install-am + #>+ 2 + no-final: + $(MAKE) libKEYImporter_la_OBJECTS="$(libKEYImporter_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: + $(MAKE) libKEYImporter_la_OBJECTS="$(libKEYImporter_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean + + #>+ 3 + kde-rpo-clean: + -rm -f *.rpo Index: Makefile.in =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/KEYImporter/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 25 Oct 2003 15:52:08 -0000 1.4 --- Makefile.in 22 Nov 2003 19:50:04 -0000 1.5 *************** *** 1,3 **** ! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. --- 1,4 ---- ! # KDE tags expanded automatically by am_edit - $Revision$ ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. *************** *** 21,24 **** --- 22,29 ---- prefix = @prefix@ exec_prefix = @exec_prefix@ + #>- + bindir = @bindir@ + #>+ 3 + DEPDIR = .deps bindir = @bindir@ *************** *** 230,234 **** libKEYImporter_la_LDFLAGS = -version-info 0:0:0 -L../Core -lcore -ldl ! libKEYImporter_la_METASOURCES = AUTO libKEYImporter_la_SOURCES = Dictionary.cpp KEYImporter.cpp KeyImp.cpp KEYImpCD.cpp --- 235,239 ---- libKEYImporter_la_LDFLAGS = -version-info 0:0:0 -L../Core -lcore -ldl ! #>- libKEYImporter_la_METASOURCES = AUTO libKEYImporter_la_SOURCES = Dictionary.cpp KEYImporter.cpp KeyImp.cpp KEYImpCD.cpp *************** *** 245,255 **** LIBS = @LIBS@ libKEYImporter_la_LIBADD = ! libKEYImporter_la_OBJECTS = Dictionary.lo KEYImporter.lo KeyImp.lo \ ! KEYImpCD.lo CXXFLAGS = @CXXFLAGS@ ! CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in --- 250,272 ---- LIBS = @LIBS@ libKEYImporter_la_LIBADD = ! #>- libKEYImporter_la_OBJECTS = Dictionary.lo KEYImporter.lo KeyImp.lo \ ! #>- KEYImpCD.lo ! #>+ 5 ! libKEYImporter_la_final_OBJECTS = libKEYImporter_la.all_cpp.lo ! libKEYImporter_la_nofinal_OBJECTS = Dictionary.lo KEYImporter.lo KeyImp.lo \ ! KEYImpCD.lo ! @KDE_USE_FINAL_FALSE@libKEYImporter_la_OBJECTS = $(libKEYImporter_la_nofinal_OBJECTS) ! @KDE_USE_FINAL_TRUE@libKEYImporter_la_OBJECTS = $(libKEYImporter_la_final_OBJECTS) CXXFLAGS = @CXXFLAGS@ ! #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! #>+ 1 ! CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) ! #>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! #>+ 1 ! LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) CXXLD = $(CXX) ! #>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ ! #>+ 1 ! CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in *************** *** 259,276 **** TAR = gtar GZIP_ENV = --best ! DEP_FILES = .deps/Dictionary.P .deps/KEYImpCD.P .deps/KEYImporter.P \ ! .deps/KeyImp.P SOURCES = $(libKEYImporter_la_SOURCES) OBJECTS = $(libKEYImporter_la_OBJECTS) ! all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .cpp .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu gemrb/plugins/KEYImporter/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status --- 276,305 ---- TAR = gtar GZIP_ENV = --best ! #>- DEP_FILES = .deps/Dictionary.P .deps/KEYImpCD.P .deps/KEYImporter.P \ ! #>- .deps/KeyImp.P ! #>+ 6 ! @KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libKEYImporter_la.all_cpp.P \ ! .deps/Dictionary.P .deps/KEYImpCD.P .deps/KEYImporter.P \ ! .deps/KeyImp.P ! @KDE_USE_FINAL_FALSE@DEP_FILES = .deps/Dictionary.P .deps/KEYImpCD.P .deps/KEYImporter.P \ ! .deps/KeyImp.P ! SOURCES = $(libKEYImporter_la_SOURCES) OBJECTS = $(libKEYImporter_la_OBJECTS) ! #>- all: all-redirect ! #>+ 1 ! all: docs-am all-redirect .SUFFIXES: .SUFFIXES: .S .c .cpp .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + #>- cd $(top_srcdir) && $(AUTOMAKE) --gnu gemrb/plugins/KEYImporter/Makefile + #>+ 2 cd $(top_srcdir) && $(AUTOMAKE) --gnu gemrb/plugins/KEYImporter/Makefile + cd $(top_srcdir) && perl admin/am_edit gemrb/plugins/KEYImporter/Makefile.in Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status *************** *** 288,295 **** $(mkinstalldirs) $(DESTDIR)$(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! if test -f $$p; then \ ! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ ! else :; fi; \ done --- 317,324 ---- $(mkinstalldirs) $(DESTDIR)$(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! if test -f $$p; then \ ! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ ! else :; fi; \ done *************** *** 297,301 **** @$(NORMAL_UNINSTALL) list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done --- 326,330 ---- @$(NORMAL_UNINSTALL) list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done *************** *** 352,359 **** list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) --- 381,388 ---- list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) *************** *** 362,369 **** list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: --- 391,398 ---- list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: *************** *** 385,398 **** distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ ! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu gemrb/plugins/KEYImporter/Makefile @for file in $(DISTFILES); do \ ! d=$(srcdir); \ ! if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ ! else \ ! test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ ! fi; \ done --- 414,427 ---- distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ ! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu gemrb/plugins/KEYImporter/Makefile @for file in $(DISTFILES); do \ ! d=$(srcdir); \ ! if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ ! else \ ! test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ ! fi; \ done *************** *** 415,420 **** @-cp .deps/$(*F).pp .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ rm .deps/$(*F).pp --- 444,449 ---- @-cp .deps/$(*F).pp .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ rm .deps/$(*F).pp *************** *** 423,430 **** $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ! < .deps/$(*F).pp > .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ rm -f .deps/$(*F).pp --- 452,459 ---- $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ! < .deps/$(*F).pp > .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ rm -f .deps/$(*F).pp *************** *** 434,439 **** @-cp .deps/$(*F).pp .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ rm .deps/$(*F).pp --- 463,468 ---- @-cp .deps/$(*F).pp .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ rm .deps/$(*F).pp *************** *** 442,449 **** $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ! < .deps/$(*F).pp > .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ rm -f .deps/$(*F).pp info-am: --- 471,478 ---- $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ! < .deps/$(*F).pp > .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ rm -f .deps/$(*F).pp info-am: *************** *** 484,500 **** maintainer-clean-generic: mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ ! mostlyclean-generic mostlyclean: mostlyclean-am ! clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ ! clean-depend clean-generic mostlyclean-am ! clean: clean-am distclean-am: distclean-libLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-depend \ ! distclean-generic clean-am -rm -f libtool --- 513,534 ---- maintainer-clean-generic: mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ ! mostlyclean-generic mostlyclean: mostlyclean-am ! #>- clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ ! #>- clean-depend clean-generic mostlyclean-am ! #>+ 2 ! clean-am: clean-final clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ ! clean-depend clean-generic mostlyclean-am ! #>- clean: clean-am ! #>+ 1 ! clean: kde-rpo-clean clean-am distclean-am: distclean-libLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-depend \ ! distclean-generic clean-am -rm -f libtool *************** *** 502,508 **** maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ ! maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-depend \ ! maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." --- 536,542 ---- maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ ! maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-depend \ ! maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." *************** *** 511,526 **** .PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ ! clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ ! uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ ! distclean-compile clean-compile maintainer-clean-compile \ ! mostlyclean-libtool distclean-libtool clean-libtool \ ! maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ ! clean-tags maintainer-clean-tags distdir mostlyclean-depend \ ! distclean-depend clean-depend maintainer-clean-depend info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean --- 545,560 ---- .PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ ! clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ ! uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ ! distclean-compile clean-compile maintainer-clean-compile \ ! mostlyclean-libtool distclean-libtool clean-libtool \ ! maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ ! clean-tags maintainer-clean-tags distdir mostlyclean-depend \ ! distclean-depend clean-depend maintainer-clean-depend info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean *************** *** 530,531 **** --- 564,610 ---- # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: + + #>+ 2 + docs-am: + + #>+ 5 + force-reedit: + cd $(top_srcdir) && $(AUTOMAKE) --gnu gemrb/plugins/KEYImporter/Makefile + cd $(top_srcdir) && perl admin/am_edit gemrb/plugins/KEYImporter/Makefile.in + + + #>+ 11 + libKEYImporter_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Dictionary.cpp $(srcdir)/KEYImporter.cpp $(srcdir)/KeyImp.cpp $(srcdir)/KEYImpCD.cpp + @echo 'creating libKEYImporter_la.all_cpp.cpp ...'; \ + rm -f libKEYImporter_la.all_cpp.files libKEYImporter_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libKEYImporter_la.all_cpp.final; \ + for file in Dictionary.cpp KEYImporter.cpp KeyImp.cpp KEYImpCD.cpp ; do \ + echo "#include \"$$file\"" >> libKEYImporter_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libKEYImporter_la.all_cpp.final; \ + done; \ + cat libKEYImporter_la.all_cpp.final libKEYImporter_la.all_cpp.files > libKEYImporter_la.all_cpp.cpp; \ + rm -f libKEYImporter_la.all_cpp.final libKEYImporter_la.all_cpp.files + + #>+ 3 + clean-final: + -rm -f libKEYImporter_la.all_cpp.cpp + + #>+ 2 + final: + $(MAKE) libKEYImporter_la_OBJECTS="$(libKEYImporter_la_final_OBJECTS)" all-am + #>+ 2 + final-install: + $(MAKE) libKEYImporter_la_OBJECTS="$(libKEYImporter_la_final_OBJECTS)" install-am + #>+ 2 + no-final: + $(MAKE) libKEYImporter_la_OBJECTS="$(libKEYImporter_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: + $(MAKE) libKEYImporter_la_OBJECTS="$(libKEYImporter_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean + + #>+ 3 + kde-rpo-clean: + -rm -f *.rpo |