Revision: 1443 http://svn.sourceforge.net/geany/?rev=1443&view=rev Author: eht16 Date: 2007-04-08 09:38:46 -0700 (Sun, 08 Apr 2007)
Log Message: ----------- Made "distcheck" working.
Modified Paths: -------------- trunk/ChangeLog trunk/Makefile.am trunk/configure.in trunk/doc/Makefile.am trunk/scintilla/Makefile.am trunk/src/Makefile.am trunk/tagmanager/Makefile.am
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-04-07 15:05:09 UTC (rev 1442) +++ trunk/ChangeLog 2007-04-08 16:38:46 UTC (rev 1443) @@ -1,3 +1,10 @@ +2007-04-08 Enrico Tröger enrico.troeger@uvena.de + + * configure.in, Makefile.am, doc/Makefile.am, scintilla/Makefile.am, + src/Makefile.am, tagmanager/Makefile.am: + Made "distcheck" working. + + 2007-04-06 Nick Treleaven nick.treleaven@btinternet.com
* src/sci_cb.c:
Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2007-04-07 15:05:09 UTC (rev 1442) +++ trunk/Makefile.am 2007-04-08 16:38:46 UTC (rev 1443) @@ -16,7 +16,7 @@ data/latex.tags \ data/pascal.tags \ data/html_entities.tags \ - data/filetypes.* \ + $(srcdir)/data/filetypes.* \ data/filetype_extensions.conf
EXTRA_DIST = \ @@ -28,6 +28,7 @@ HACKING \ README.I18N \ po/intl_stats.sh \ + po/LINGUAS \ $(SYS_DATA_FILES) \ $(WIN32_BUILD_FILES)
@@ -46,12 +47,12 @@ done \ fi $(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \ - $(INSTALL_DATA) data/global.tags $(DESTDIR)$(pkgdatadir); \ - $(INSTALL_DATA) data/php.tags $(DESTDIR)$(pkgdatadir); \ - $(INSTALL_DATA) data/pascal.tags $(DESTDIR)$(pkgdatadir); \ - $(INSTALL_DATA) data/latex.tags $(DESTDIR)$(pkgdatadir); \ - $(INSTALL_DATA) data/html_entities.tags $(DESTDIR)$(pkgdatadir); \ - $(INSTALL_DATA) COPYING $(DESTDIR)$(pkgdatadir)/GPL-2; \ + $(INSTALL_DATA) $(srcdir)/data/global.tags $(DESTDIR)$(pkgdatadir); \ + $(INSTALL_DATA) $(srcdir)/data/php.tags $(DESTDIR)$(pkgdatadir); \ + $(INSTALL_DATA) $(srcdir)/data/pascal.tags $(DESTDIR)$(pkgdatadir); \ + $(INSTALL_DATA) $(srcdir)/data/latex.tags $(DESTDIR)$(pkgdatadir); \ + $(INSTALL_DATA) $(srcdir)/data/html_entities.tags $(DESTDIR)$(pkgdatadir); \ + $(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/GPL-2; \ for file in $(srcdir)/data/*; do \ if test -f $$file; then \ $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/; \ @@ -61,7 +62,7 @@ dist-hook: if test -d pixmaps; then \ mkdir $(distdir)/pixmaps; \ - for pixmap in pixmaps/*; do \ + for pixmap in $(srcdir)/pixmaps/*; do \ if test -f $$pixmap; then \ cp -p $$pixmap $(distdir)/pixmaps; \ fi \
Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2007-04-07 15:05:09 UTC (rev 1442) +++ trunk/configure.in 2007-04-08 16:38:46 UTC (rev 1443) @@ -124,7 +124,7 @@ AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
-ALL_LINGUAS="`sed -e '/^#/d' po/LINGUAS`" # take all languages found in file po/LINGUAS +ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`" # take all languages found in file po/LINGUAS
AM_GLIB_GNU_GETTEXT
Modified: trunk/doc/Makefile.am =================================================================== --- trunk/doc/Makefile.am 2007-04-07 15:05:09 UTC (rev 1442) +++ trunk/doc/Makefile.am 2007-04-08 16:38:46 UTC (rev 1443) @@ -1,22 +1,22 @@ man_MANS=geany.1 DOCDIR = $(DESTDIR)/$(datadir)/doc/@PACKAGE@ -HTML_FILES = html/*.html geany.css +HTML_FILES = html/*.html IMAGE_FILES = images/*.png EXTRA_DIST = geany.css geany.xsl make_webable.sh geany.txt geany_gpl.docbook geany.1 \ - scikeybinding.docbook geany.docbook $(HTML_FILES) $(IMAGE_FILES) + scikeybinding.docbook geany.docbook $(srcdir)/$(HTML_FILES) $(srcdir)/$(IMAGE_FILES)
pdf: - SP_ENCODING=XML SP_CHARSET_FIXED=YES jw -b pdf geany.docbook - mv geany.pdf geany-$(VERSION).pdf + SP_ENCODING=XML SP_CHARSET_FIXED=YES jw -b pdf $(srcdir)/geany.docbook + mv doc/geany.pdf geany-$(VERSION).pdf
geany.txt: - jw -b txt geany.docbook + jw -b txt $(srcdir)/doc/geany.docbook
htmldoc: geany.docbook if [ geany.docbook -nt "./html/index.html" ]; then \ $(mkinstalldirs) html; \ - xmlto -m geany.xsl -o html/ xhtml geany.docbook; \ - test -f html/geany.css || cp geany.css html/; \ + xmlto -m geany.xsl -o html/ xhtml $(srcdir)/geany.docbook; \ + test -f html/geany.css || cp $(srcdir)/geany.css html/; \ fi
doc: geany.txt htmldoc @@ -33,24 +33,25 @@
install-data-local: $(mkinstalldirs) $(DOCDIR)/html/images - for file in `ls $(HTML_FILES)`; do \ + for file in `ls $(srcdir)/$(HTML_FILES)`; do \ if [ -f $$file ]; then \ basefile=`echo $$file | sed -e 's,^.*/,,'`; \ - $(INSTALL_DATA) $(srcdir)/$$file $(DOCDIR)/html/$$basefile; \ + $(INSTALL_DATA) $$file $(DOCDIR)/html/$$basefile; \ fi \ done - for file in `ls $(IMAGE_FILES)`; do \ + for file in `ls $(srcdir)/$(IMAGE_FILES)`; do \ if [ -f $$file ]; then \ basefile=`echo $$file | sed -e 's,^.*/,,'`; \ - $(INSTALL_DATA) $(srcdir)/$$file $(DOCDIR)/html/images/$$basefile; \ + $(INSTALL_DATA) $$file $(DOCDIR)/html/images/$$basefile; \ fi \ done - $(INSTALL_DATA) geany.txt $(DOCDIR)/manual.txt - $(INSTALL_DATA) ../README $(DOCDIR) - $(INSTALL_DATA) ../ChangeLog $(DOCDIR) - $(INSTALL_DATA) ../NEWS $(DOCDIR) - $(INSTALL_DATA) ../COPYING $(DOCDIR) - $(INSTALL_DATA) ../AUTHORS $(DOCDIR) - $(INSTALL_DATA) ../TODO $(DOCDIR) - $(INSTALL_DATA) ../scintilla/License.txt $(DOCDIR)/ScintillaLicense.txt + $(INSTALL_DATA) $(srcdir)/geany.css $(DOCDIR)/html/geany.css + $(INSTALL_DATA) $(srcdir)/geany.txt $(DOCDIR)/manual.txt + $(INSTALL_DATA) $(top_srcdir)/README $(DOCDIR) + $(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DOCDIR) + $(INSTALL_DATA) $(top_srcdir)/NEWS $(DOCDIR) + $(INSTALL_DATA) $(top_srcdir)/COPYING $(DOCDIR) + $(INSTALL_DATA) $(top_srcdir)/AUTHORS $(DOCDIR) + $(INSTALL_DATA) $(top_srcdir)/TODO $(DOCDIR) + $(INSTALL_DATA) $(top_srcdir)/scintilla/License.txt $(DOCDIR)/ScintillaLicense.txt
Modified: trunk/scintilla/Makefile.am =================================================================== --- trunk/scintilla/Makefile.am 2007-04-07 15:05:09 UTC (rev 1442) +++ trunk/scintilla/Makefile.am 2007-04-08 16:38:46 UTC (rev 1443) @@ -52,23 +52,46 @@ XPM.cxx \ AutoComplete.cxx \ ExternalLexer.cxx \ -*.h \ PlatGTK.cxx \ ScintillaGTK.cxx \ +AutoComplete.h \ +CallTip.h \ +CellBuffer.h \ +CharClassify.h \ +ContractionState.h \ +Converter.h \ +DocumentAccessor.h \ +Document.h \ +Editor.h \ +ExternalLexer.h \ +Indicator.h \ +KeyMap.h \ +LineMarker.h \ +Partitioning.h \ +RESearch.h \ +ScintillaBase.h \ +scintilla-marshal.h \ +SplitVector.h \ +StyleContext.h \ +Style.h \ +SVector.h \ +UniConversion.h \ +ViewStyle.h \ +XPM.h \ $(LEXER_SRCS)
libscintilla_a_SOURCES = $(SRCS)
if MINGW -INCLUDES=-I$(top_srcdir) -Iinclude -I/usr/local/cross-tools/include @PACKAGE_CFLAGS@ +INCLUDES=-I$(top_srcdir) -I$(srcdir)/include -I/usr/local/cross-tools/include @PACKAGE_CFLAGS@ else -INCLUDES=-I$(top_srcdir) -Iinclude @PACKAGE_CFLAGS@ +INCLUDES=-I$(top_srcdir) -I$(srcdir)/include @PACKAGE_CFLAGS@ endif
libscintilla_a_LIBADD = scintilla-marshal.o
scintilla-marshal.o: scintilla-marshal.c - gcc @PACKAGE_CFLAGS@ -c scintilla-marshal.c + gcc @PACKAGE_CFLAGS@ -c $(srcdir)/scintilla-marshal.c
marshallers: scintilla-marshal.list glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --header > scintilla-marshal.h
Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2007-04-07 15:05:09 UTC (rev 1442) +++ trunk/src/Makefile.am 2007-04-08 16:38:46 UTC (rev 1443) @@ -48,7 +48,7 @@ #AM_CFLAGS = -DGEANY_DEBUG -Wall -pipe -mms-bitfields -g -O0 geany_LDFLAGS = -mwindows
-INCLUDES = -I../scintilla/include -I../tagmanager/include -DENABLE_NLS \ +INCLUDES = -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include -DENABLE_NLS \ -I/usr/local/cross-tools/include @PACKAGE_CFLAGS@
geany_windres.res: @@ -66,11 +66,8 @@
INCLUDES = \ -DPACKAGE_DATA_DIR=""$(datadir)"" -DPACKAGE_LOCALE_DIR=""$(prefix)/$(DATADIRNAME)/locale"" \ - -I../scintilla/include -I../tagmanager/include @PACKAGE_CFLAGS@ + -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include @PACKAGE_CFLAGS@
clean-local:
endif - -#geany_SOURCES = $(SRCS) -#geany_LDADD = @PACKAGE_LIBS@ -lstdc++ ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a $(INTLLIBS)
Modified: trunk/tagmanager/Makefile.am =================================================================== --- trunk/tagmanager/Makefile.am 2007-04-07 15:05:09 UTC (rev 1442) +++ trunk/tagmanager/Makefile.am 2007-04-08 16:38:46 UTC (rev 1443) @@ -2,7 +2,7 @@ # $Id$
SUBDIRS = include -INCLUDES = -Iinclude $(PACKAGE_CFLAGS) +INCLUDES = -I$(srcdir)/include $(PACKAGE_CFLAGS) # -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \ # -DGDK_PIXBUF_DEPRECATED \ # -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.