Merge branch 'master' of git://ffmssmsc.jinr.ru:443/varg/ginac

[ginac.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 328100460c9c665c7606383bb2642257e5d65711..0a4dca80db872753fdfc7b1214fa671bb2e9cc2a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,18 @@
 ## Process this file with automake to produce Makefile.in
-SUBDIRS = ginac check ginsh doc
+SUBDIRS = ginac check ginsh tools doc
+DIST_SUBDIRS = ginac check ginsh tools doc
 
-# Requires automake 1.4
-AUTOMAKE_OPTIONS = 1.4
-
-# GiNaC runtime configuration script
-bin_SCRIPTS = ginac-config
+# pkg-config metadata
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ginac.pc
+$(pkgconfig_DATA): config.status
 
 # All the rest of the distributed files
-EXTRA_DIST = autogen.sh ginac.m4
-
-# M4 macro file for inclusion with autoconf
-m4datadir = $(datadir)/aclocal
-m4data_DATA = ginac.m4
+EXTRA_DIST = ginac.pc GiNaC.spec
 
-# Rule to build tar-gzipped distribution package
+# Rule to build tar-bzipped distribution package
 $(PACKAGE)-$(VERSION).tar.gz: dist
 
 # Rule to build RPM distribution package
 rpm: $(PACKAGE)-$(VERSION).tar.gz
-       cp $(PACKAGE)-$(VERSRION).tar.gz /usr/src/redhat/SOURCES
-       rpm -ba GiNaC.spec
+       rpmbuild -ta --clean $(PACKAGE)-$(VERSION).tar.gz