Changes in Makefile.am [c266281:ca1fb26a]

File:

• Makefile.am (modified) (4 diffs)

Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
 
-GIT_DESCRIPTION := $(if $(wildcard .git),$(shell git describe --match='barnowl-*' HEAD 2>/dev/null))
-GIT_FLAGS := $(if $(GIT_DESCRIPTION),-DGIT_VERSION=$(GIT_DESCRIPTION:barnowl-%=%))
+GIT_DESCRIPTION := $(if $(wildcard $(srcdir)/.git),$(shell cd $(srcdir) && git describe --match='barnowl-*' HEAD 2>/dev/null))
+VERSION = $(if $(GIT_DESCRIPTION),$(GIT_DESCRIPTION:barnowl-%=%),@VERSION@)
+-include BUILD_VERSION.mk
 
-bin_PROGRAMS = barnowl.bin
+FORCE:
+BUILD_VERSION.mk: $(if $(filter-out $(BUILD_VERSION),$(VERSION)),FORCE)
+        echo 'BUILD_VERSION = $(VERSION)' > $@
+
+bin_PROGRAMS = bin/barnowl
 if ENABLE_ZCRYPT
 bin_PROGRAMS += zcrypt
 endif
 
-zcrypt_SOURCES = zcrypt.c filterproc.c
+zcrypt_SOURCES = zcrypt.c filterproc.c version.c
 
-check_PROGRAMS = tester.bin
+check_PROGRAMS = bin/tester
+dist_check_DATA = t
+dist_check_SCRIPTS = runtests.sh
 
-barnowl_bin_SOURCES = $(BASE_SRCS) \
-     owl.h owl_perl.h config.h \
-     owl.c \
-     $(GEN_C) $(GEN_H)
+noinst_SCRIPTS = barnowl
+check_SCRIPTS = tester
 
-man_MANS = doc/barnowl.1
-doc_DATA = doc/intro.txt doc/advanced.txt
+barnowl tester: %: barnowl-wrapper.in bin/% Makefile
+        sed \
+            -e 's,[@]abs_srcdir[@],$(abs_srcdir),g' \
+            -e 's,[@]abs_builddir[@],$(abs_builddir),g' \
+            $< > $@
+        chmod +x $@
 
-barnowl_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
+bin_barnowl_SOURCES = $(BASE_SRCS) \
+     owl.h owl_perl.h \
+     owl.c
+nodist_bin_barnowl_SOURCES = $(GEN_C) $(GEN_H)
 
-tester_bin_SOURCES = $(BASE_SRCS) \
-     owl.h owl_perl.h config.h \
-     $(GEN_C) $(GEN_H) \
+dist_man_MANS = doc/barnowl.1
+dist_doc_DATA = doc/intro.txt doc/advanced.txt
+
+bin_barnowl_LDADD = compat/libcompat.a libfaim/libfaim.a
+
+bin_tester_SOURCES = $(BASE_SRCS) \
+     owl.h owl_perl.h \
      tester.c
+nodist_bin_tester_SOURCES = $(GEN_C) $(GEN_H)
 
-tester_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
+bin_tester_LDADD = compat/libcompat.a libfaim/libfaim.a
 
 TESTS=runtests.sh
 
-AM_CPPFLAGS = -I$(top_srcdir)/ \
+AM_CPPFLAGS = \
            -I$(top_srcdir)/libfaim/ \
            -DDATADIR='"$(pkgdatadir)"' \
-           -DBINDIR='"$(bindir)"' \
-           $(GIT_FLAGS)
+           -DBINDIR='"$(bindir)"'
 
 CODELIST_SRCS=message.c mainwin.c popwin.c zephyr.c messagelist.c \
-     commands.c global.c text.c fmtext.c editwin.c util.c logging.c \
+     commands.c global.c text.c fmtext.c editwin.c \
+     util.c logging.c \
      perlconfig.c keys.c functions.c zwrite.c viewwin.c help.c filter.c \
      regex.c history.c view.c dict.c variable.c filterelement.c pair.c \
@@ -45 +62 @@
      aim.c buddy.c buddylist.c style.c errqueue.c \
      zbuddylist.c popexec.c select.c wcwidth.c \
-     mainpanel.c msgwin.c sepbar.c editcontext.c signal.c
+     mainpanel.c msgwin.c sepbar.c editcontext.c signal.c closures.c
 
-NORMAL_SRCS = filterproc.c window.c windowcb.c
+NORMAL_SRCS = filterproc.c filterproc.h window.c window.h windowcb.c
 
 BASE_SRCS = $(CODELIST_SRCS) $(NORMAL_SRCS)
 
-GEN_C = varstubs.c perlglue.c
-GEN_H = owl_prototypes.h
+GEN_C = varstubs.c perlglue.c gmarshal_funcs.c version.c version.c.new
+GEN_H = owl_prototypes.h owl_prototypes.h.new gmarshal_funcs.h
 
-BUILT_SOURCES = $(GEN_C) $(GEN_H)
+BUILT_SOURCES = $(GEN_H)
 
 # Only copy file into place if file.new is different
-%: %.new
+owl_prototypes.h version.c: %: %.new
         @diff -U0 $@ $< || { \
          test -f $@ && echo '$@ changed!'; \
@@ -65 +82 @@
 proto: owl_prototypes.h
 
-perlglue.c: perlglue.xs $(TYPEMAP)
-        $(AM_V_GEN)perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes perlglue.xs > perlglue.c
+perlglue.c: perlglue.xs typemap
+        $(AM_V_GEN)perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes $< > $@
 
 varstubs.c: stubgen.pl variable.c
@@ -74 +91 @@
         $(AM_V_GEN)perl $< $(sort $(filter-out $<,$+)) > $@
 
+version.c.new: Makefile BUILD_VERSION.mk
+        $(AM_V_GEN)echo 'const char *version = "$(VERSION)";' > $@
+
+gmarshal_funcs.h: marshal_types
+        glib-genmarshal --header $< > $@
+gmarshal_funcs.c: marshal_types
+        glib-genmarshal --body $< > $@
+
 # For emacs flymake-mode
 check-syntax: proto
         $(COMPILE) -Wall -Wextra -pedantic -fsyntax-only $(CHK_SOURCES)
 
-install-data-local:
-        $(mkinstalldirs) ${DESTDIR}${pkgdatadir}/lib
-        (cd perl/lib && tar -cf - . ) | (cd ${DESTDIR}${pkgdatadir}/lib && tar -xf - )
-
-do_transform = $(shell echo '$(1)' | sed '$(transform)')
-install-exec-hook:
-        mv -f $(DESTDIR)$(bindir)/$(call do_transform,barnowl.bin) \
-              $(DESTDIR)$(bindir)/$(call do_transform,barnowl)
+CLEANFILES = $(BUILT_SOURCES) $(GEN_C) $(noinst_SCRIPTS) $(check_SCRIPTS) BUILD_VERSION.mk
+EXTRA_DIST = \
+    autogen.sh \
+    barnowl-wrapper.in \
+    codelist.pl \
+    doc/code.txt \
+    doc/owl-window.txt \
+    doc/releasing-barnowl.txt \
+    examples \
+    marshal_types \
+    perlglue.xs \
+    scripts \
+    stubgen.pl \
+    typemap
 
 SUBDIRS = compat libfaim perl