neox
/
xml-copy-editor-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed an installation problem

This commit is contained in:
Zane U. Ji 2012-09-17 07:09:49 +08:00
parent a3dbae7241
commit 3187e3a4ce
2 changed files with 101 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Makefile.am
View File

@ -35,20 +35,48 @@ xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \
xmlcopyeditor_LDFLAGS = $(WX_LIBS) \ xmlcopyeditor_LDFLAGS = $(WX_LIBS) \
-lexpat -lxslt -lxml2 -lpcre -lxerces-c $(ASPELL_LIBS) $(ENCHANT_LIBS) -lexpat -lxslt -lxml2 -lpcre -lxerces-c $(ASPELL_LIBS) $(ENCHANT_LIBS)
dist_xmlcopyeditor_DATA = $(srcdir)/catalog/* \ nobase_dist_xmlcopyeditor_DATA = $(srcdir)/catalog/catalog \
$(srcdir)/copying/* \ $(srcdir)/copying/*.txt \
$(srcdir)/dtd/* \ $(srcdir)/copying/Apache/LICENSE-2.0 \
$(srcdir)/help/* \ $(srcdir)/copying/Apache/LICENSE-2_files/* \
$(srcdir)/copying/Aspell/* \
$(srcdir)/copying/boost_shared_ptr/* \
$(srcdir)/copying/Expat/* \
$(srcdir)/copying/libxml2/* \
$(srcdir)/copying/libxslt/* \
$(srcdir)/copying/PCRE/* \
$(srcdir)/copying/Scintilla/* \
$(srcdir)/copying/wxStEditor/* \
$(srcdir)/copying/wxStyledTextCtrl/* \
$(srcdir)/copying/xmlcopyeditor/* \
$(srcdir)/dtd/*.* \
$(srcdir)/dtd/dita/*.* \
$(srcdir)/dtd/docbook/4.4/*.* \
$(srcdir)/dtd/docbook/4.4/ent/*.* \
$(srcdir)/dtd/docbook/5.0b/*.* \
$(srcdir)/dtd/tei/p4/*.* \
$(srcdir)/dtd/tei/p5/*.* \
$(srcdir)/help/*.* \
$(srcdir)/help/html/*.* \
$(srcdir)/png/*.png \ $(srcdir)/png/*.png \
$(srcdir)/po/*/messages.mo \ $(srcdir)/po/*/messages.mo \
$(srcdir)/rng/*.rnc \ $(srcdir)/rng/*.rnc \
$(srcdir)/rng/*.rng \ $(srcdir)/rng/*.rng \
$(srcdir)/rng/exclude/*.rng \ $(srcdir)/rng/exclude/*.rng \
$(srcdir)/rng/modules/*.rng \ $(srcdir)/rng/modules/*.rng \
$(srcdir)/rulesets/* \ $(srcdir)/rulesets/*.* \
$(srcdir)/templates/* \ $(srcdir)/templates/*.dtd \
$(srcdir)/templates/*.html \
$(srcdir)/templates/*.lzx \
$(srcdir)/templates/*.rng \
$(srcdir)/templates/*.rss \
$(srcdir)/templates/*.xlf \
$(srcdir)/templates/*.xml \
$(srcdir)/templates/*.xsd \
$(srcdir)/templates/*.xsl \
$(srcdir)/templates/*.xtm \
$(srcdir)/xpm/*.xpm \ $(srcdir)/xpm/*.xpm \
$(srcdir)/xsl/* $(srcdir)/xsl/openlearn2daisyhtml/*.*
pixmap_DATA = xmlcopyeditor.png pixmap_DATA = xmlcopyeditor.png

99
src/Makefile.in
View File

@ -38,7 +38,7 @@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
bin_PROGRAMS = xmlcopyeditor$(EXEEXT) bin_PROGRAMS = xmlcopyeditor$(EXEEXT)
subdir = src subdir = src
DIST_COMMON = $(dist_xmlcopyeditor_DATA) $(noinst_HEADERS) \ DIST_COMMON = $(nobase_dist_xmlcopyeditor_DATA) $(noinst_HEADERS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in am__aclocal_m4_deps = $(top_srcdir)/configure.in
@ -125,7 +125,8 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \ $(am__cd) "$$dir" && rm -f $$files; }; \
} }
DATA = $(applications_DATA) $(dist_xmlcopyeditor_DATA) $(pixmap_DATA) DATA = $(applications_DATA) $(nobase_dist_xmlcopyeditor_DATA) \
$(pixmap_DATA)
HEADERS = $(noinst_HEADERS) HEADERS = $(noinst_HEADERS)
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
@ -285,20 +286,48 @@ xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \
xmlcopyeditor_LDFLAGS = $(WX_LIBS) \ xmlcopyeditor_LDFLAGS = $(WX_LIBS) \
-lexpat -lxslt -lxml2 -lpcre -lxerces-c $(ASPELL_LIBS) $(ENCHANT_LIBS) -lexpat -lxslt -lxml2 -lpcre -lxerces-c $(ASPELL_LIBS) $(ENCHANT_LIBS)
dist_xmlcopyeditor_DATA = $(srcdir)/catalog/* \ nobase_dist_xmlcopyeditor_DATA = $(srcdir)/catalog/catalog \
$(srcdir)/copying/* \ $(srcdir)/copying/*.txt \
$(srcdir)/dtd/* \ $(srcdir)/copying/Apache/LICENSE-2.0 \
$(srcdir)/help/* \ $(srcdir)/copying/Apache/LICENSE-2_files/* \
$(srcdir)/copying/Aspell/* \
$(srcdir)/copying/boost_shared_ptr/* \
$(srcdir)/copying/Expat/* \
$(srcdir)/copying/libxml2/* \
$(srcdir)/copying/libxslt/* \
$(srcdir)/copying/PCRE/* \
$(srcdir)/copying/Scintilla/* \
$(srcdir)/copying/wxStEditor/* \
$(srcdir)/copying/wxStyledTextCtrl/* \
$(srcdir)/copying/xmlcopyeditor/* \
$(srcdir)/dtd/*.* \
$(srcdir)/dtd/dita/*.* \
$(srcdir)/dtd/docbook/4.4/*.* \
$(srcdir)/dtd/docbook/4.4/ent/*.* \
$(srcdir)/dtd/docbook/5.0b/*.* \
$(srcdir)/dtd/tei/p4/*.* \
$(srcdir)/dtd/tei/p5/*.* \
$(srcdir)/help/*.* \
$(srcdir)/help/html/*.* \
$(srcdir)/png/*.png \ $(srcdir)/png/*.png \
$(srcdir)/po/*/messages.mo \ $(srcdir)/po/*/messages.mo \
$(srcdir)/rng/*.rnc \ $(srcdir)/rng/*.rnc \
$(srcdir)/rng/*.rng \ $(srcdir)/rng/*.rng \
$(srcdir)/rng/exclude/*.rng \ $(srcdir)/rng/exclude/*.rng \
$(srcdir)/rng/modules/*.rng \ $(srcdir)/rng/modules/*.rng \
$(srcdir)/rulesets/* \ $(srcdir)/rulesets/*.* \
$(srcdir)/templates/* \ $(srcdir)/templates/*.dtd \
$(srcdir)/templates/*.html \
$(srcdir)/templates/*.lzx \
$(srcdir)/templates/*.rng \
$(srcdir)/templates/*.rss \
$(srcdir)/templates/*.xlf \
$(srcdir)/templates/*.xml \
$(srcdir)/templates/*.xsd \
$(srcdir)/templates/*.xsl \
$(srcdir)/templates/*.xtm \
$(srcdir)/xpm/*.xpm \ $(srcdir)/xpm/*.xpm \
$(srcdir)/xsl/* $(srcdir)/xsl/openlearn2daisyhtml/*.*
pixmap_DATA = xmlcopyeditor.png pixmap_DATA = xmlcopyeditor.png
applications_DATA = xmlcopyeditor.desktop applications_DATA = xmlcopyeditor.desktop
@ -493,23 +522,26 @@ uninstall-applicationsDATA:
@list='$(applications_DATA)'; test -n "$(applicationsdir)" || list=; \ @list='$(applications_DATA)'; test -n "$(applicationsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(applicationsdir)'; $(am__uninstall_files_from_dir) dir='$(DESTDIR)$(applicationsdir)'; $(am__uninstall_files_from_dir)
install-dist_xmlcopyeditorDATA: $(dist_xmlcopyeditor_DATA) install-nobase_dist_xmlcopyeditorDATA: $(nobase_dist_xmlcopyeditor_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(xmlcopyeditordir)" || $(MKDIR_P) "$(DESTDIR)$(xmlcopyeditordir)" test -z "$(xmlcopyeditordir)" || $(MKDIR_P) "$(DESTDIR)$(xmlcopyeditordir)"
@list='$(dist_xmlcopyeditor_DATA)'; test -n "$(xmlcopyeditordir)" || list=; \ @list='$(nobase_dist_xmlcopyeditor_DATA)'; test -n "$(xmlcopyeditordir)" || list=; \
for p in $$list; do \ $(am__nobase_list) | while read dir files; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ xfiles=; for file in $$files; do \
echo "$$d$$p"; \ if test -f "$$file"; then xfiles="$$xfiles $$file"; \
done | $(am__base_list) | \ else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
while read files; do \ test -z "$$xfiles" || { \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xmlcopyeditordir)'"; \ test "x$$dir" = x. || { \
$(INSTALL_DATA) $$files "$(DESTDIR)$(xmlcopyeditordir)" || exit $$?; \ echo "$(MKDIR_P) '$(DESTDIR)$(xmlcopyeditordir)/$$dir'"; \
$(MKDIR_P) "$(DESTDIR)$(xmlcopyeditordir)/$$dir"; }; \
echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(xmlcopyeditordir)/$$dir'"; \
$(INSTALL_DATA) $$xfiles "$(DESTDIR)$(xmlcopyeditordir)/$$dir" || exit $$?; }; \
done done
uninstall-dist_xmlcopyeditorDATA: uninstall-nobase_dist_xmlcopyeditorDATA:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@list='$(dist_xmlcopyeditor_DATA)'; test -n "$(xmlcopyeditordir)" || list=; \ @list='$(nobase_dist_xmlcopyeditor_DATA)'; test -n "$(xmlcopyeditordir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
dir='$(DESTDIR)$(xmlcopyeditordir)'; $(am__uninstall_files_from_dir) dir='$(DESTDIR)$(xmlcopyeditordir)'; $(am__uninstall_files_from_dir)
install-pixmapDATA: $(pixmap_DATA) install-pixmapDATA: $(pixmap_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
@ -672,7 +704,7 @@ info: info-am
info-am: info-am:
install-data-am: install-applicationsDATA \ install-data-am: install-applicationsDATA \
install-dist_xmlcopyeditorDATA install-pixmapDATA install-nobase_dist_xmlcopyeditorDATA install-pixmapDATA
install-dvi: install-dvi-am install-dvi: install-dvi-am
@ -719,7 +751,7 @@ ps: ps-am
ps-am: ps-am:
uninstall-am: uninstall-applicationsDATA uninstall-binPROGRAMS \ uninstall-am: uninstall-applicationsDATA uninstall-binPROGRAMS \
uninstall-dist_xmlcopyeditorDATA uninstall-pixmapDATA uninstall-nobase_dist_xmlcopyeditorDATA uninstall-pixmapDATA
.MAKE: install-am install-strip .MAKE: install-am install-strip
@ -728,16 +760,17 @@ uninstall-am: uninstall-applicationsDATA uninstall-binPROGRAMS \
distclean-generic distclean-libtool distclean-tags distdir dvi \ distclean-generic distclean-libtool distclean-tags distdir dvi \
dvi-am html html-am info info-am install install-am \ dvi-am html html-am info info-am install install-am \
install-applicationsDATA install-binPROGRAMS install-data \ install-applicationsDATA install-binPROGRAMS install-data \
install-data-am install-dist_xmlcopyeditorDATA install-dvi \ install-data-am install-dvi install-dvi-am install-exec \
install-dvi-am install-exec install-exec-am install-html \ install-exec-am install-html install-html-am install-info \
install-html-am install-info install-info-am install-man \ install-info-am install-man \
install-pdf install-pdf-am install-pixmapDATA install-ps \ install-nobase_dist_xmlcopyeditorDATA install-pdf \
install-ps-am install-strip installcheck installcheck-am \ install-pdf-am install-pixmapDATA install-ps install-ps-am \
installdirs maintainer-clean maintainer-clean-generic \ install-strip installcheck installcheck-am installdirs \
mostlyclean mostlyclean-compile mostlyclean-generic \ maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
uninstall-am uninstall-applicationsDATA uninstall-binPROGRAMS \ pdf pdf-am ps ps-am tags uninstall uninstall-am \
uninstall-dist_xmlcopyeditorDATA uninstall-pixmapDATA uninstall-applicationsDATA uninstall-binPROGRAMS \
uninstall-nobase_dist_xmlcopyeditorDATA uninstall-pixmapDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.