X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=a617a46aac2d5fd9f4dafb9c8fef5ec17c5994bf;hb=d80f36a3297ceb1faa15915775fa47b956d92e3f;hp=a8269cf2616d14b475c5fe34bf9fef2437fe6864;hpb=da003742d9fbc051024e89241d5796e6403aded9;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index a8269cf261..a617a46aac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,56 +1,69 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak lyx.1 core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \
-	$(srcdir)/configure $(srcdir)/development/lyx.spec \
-	$(srcdir)/acinclude.m4
-SUBDIRS = intl po sigc++ boost src lib
-
-EXTRA_DIST = ANNOUNCE OLD-CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \
-	UPGRADING lyx.man acconfig.h \
-	config development forms images
-ETAGS_ARGS = --lang=c++
+include $(top_srcdir)/config/common.am
+
+ACLOCAL_AMFLAGS = -I m4 -I config
+
+DISTCLEANFILES += lyx.1 config.status config.cache config.log
+
+MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
+	$(srcdir)/configure
+
+DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
+
+if USE_INCLUDED_BOOST
+SUBDIRS = config development intl po boost src sourcedoc lib
+else
+SUBDIRS = config development intl po src sourcedoc lib
+endif
+
+EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
+	INSTALL.Win32 INSTALL.MacOSX INSTALL.scons README.Win32 README.Cygwin \
+	lyx.man autogen.sh
+
 man_MANS = lyx.1
 
 ## Needed by bindist
-bindistdir=lyxbin
+bindistdir=$(PWD)/lyxbin
 bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
 
 lyx.1:
 	cp -p $(srcdir)/lyx.man lyx.1
 
-dist-hook:
-	cd $(distdir) ; rm -rf `find config -name \*CVS\*` ; \
-	rm -rf `find development -name \*CVS\*` ; \
-	rm -rf `find forms -name \*CVS\*` ; \
-	rm -rf `find images -name \*CVS\*`
-
 rpmdist: dist
-	ln -s lib/images/lyx.xpm . ; \
-	rpm -ta ${PACKAGE}-${VERSION}.tar.gz ; saved_status=$$?; \
+	$(LN_S) $(srcdir)/lib/images/lyx.xpm . ; \
+	if [ -z "`type -path rpmbuild`" ]; \
+	then \
+		RPMBUILD=rpm; \
+	else \
+		RPMBUILD=rpmbuild; \
+	fi; $$RPMBUILD -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \
 	rm lyx.xpm; exit $$saved_status
 
-
 bindist:
-	mkdir $(bindistdir)
-	if test -f README.bin ; then \
-	  $(INSTALL) README.bin  $(bindistdir)/README.bin ; \
-	fi 
-	$(MAKE) $(AM_MAKEFLAGS) install-strip prefix=`pwd`/$(bindistdir)
-	(cd $(bindistdir) ; tar cf - .) | gzip >$(bindistfile)
-	rm -rf $(bindistdir)
-	@if test -f README.bin ; then \
+	rm -f $(bindistfile)
+	$(MAKE) $(AM_MAKEFLAGS) DESTDIR=$(bindistdir) install-strip
+	if test -f $(top_srcdir)/README.bin ; then \
+	  $(INSTALL) $(top_srcdir)/README.bin \
+		$(bindistdir)$(prefix)/README.bin ; \
+	fi
+	(cd $(bindistdir)$(prefix) ; $(AMTAR) cf - . ) | \
+	GZIP=$(GZIP_ENV) gzip > $(bindistfile)
+	-chmod -R a+w $(bindistdir) > /dev/null 2>&1 ; rm -rf $(bindistdir)
+	@if test -f $(top_srcdir)/README.bin ; then \
 	  echo "*** Did you remember to check the contents of README.bin?" ; \
 	else \
 	  echo "*** WARNING: You did not provide a README.bin file." ; \
 	  echo "*** Please make one now from the example file" ; \
 	  echo "***   development/tools/README.bin.example" ; \
-	fi  
+	fi
 	@echo "*** It should mention any problem concerning your binary"
 	@echo "*** distribution and refer to *you* in case of problem."
 	@echo "*** $(bindistfile) has been created."
 
+doxydoc:
+	cd sourcedoc; make doxydoc
+
+lgbtags:
+	etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
+
+.PHONY: doxydoc
 
-sourcedoc:
-	mkdir sourcedoc
-	cd sourcedoc ; \
-	doc++ -p `find ../$(top_srcdir)/src -name \*.h`