Changeset 4adc69b for Makefile.am

Timestamp:

Apr 4, 2013, 2:32:56 AM (12 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Parents:

13a39ae8 (diff), 3624a2c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 3624a2caf75400743f257ffcf68a274d6d21f689 into 13a39ae85b50a361ce1f1c27746d66e2d1470649

File:

• Makefile.am (modified) (6 diffs)

Makefile.am

@@ -12 +12 @@
 
 check_PROGRAMS = tester.bin
+dist_check_DATA = t
+dist_check_SCRIPTS = runtests.sh
+
+bin_SCRIPTS = barnowl
+check_SCRIPTS = tester
+
+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_SOURCES = $(BASE_SRCS) \
-     owl.h owl_perl.h config.h \
-     owl.c \
-     $(GEN_C) $(GEN_H)
+     owl.h owl_perl.h \
+     owl.c
+nodist_barnowl_bin_SOURCES = $(GEN_C) $(GEN_H)
 
-man_MANS = doc/barnowl.1
-doc_DATA = doc/intro.txt doc/advanced.txt
+dist_man_MANS = doc/barnowl.1
+dist_doc_DATA = doc/intro.txt doc/advanced.txt
 
 barnowl_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
 
 tester_bin_SOURCES = $(BASE_SRCS) \
-     owl.h owl_perl.h config.h \
-     $(GEN_C) $(GEN_H) \
+     owl.h owl_perl.h \
      tester.c
+nodist_tester_bin_SOURCES = $(GEN_C) $(GEN_H)
 
 tester_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
@@ -32 +44 @@
 TESTS=runtests.sh
 
-AM_CPPFLAGS = -I$(top_srcdir)/ \
+AM_CPPFLAGS = \
            -I$(top_srcdir)/libfaim/ \
            -DDATADIR='"$(pkgdatadir)"' \
@@ -48 +60 @@
      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 gmarshal_funcs.c
-GEN_H = owl_prototypes.h gmarshal_funcs.h
+GEN_H = owl_prototypes.h owl_prototypes.h.new gmarshal_funcs.h
 
 BUILT_SOURCES = $(GEN_C) $(GEN_H)
@@ -66 +78 @@
 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
@@ -84 +96 @@
         $(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:
@@ -93 +101 @@
               $(DESTDIR)$(bindir)/$(call do_transform,barnowl)
 
+uninstall-local:
+        rm -f $(DESTDIR)$(bindir)/$(call do_transform,barnowl)
+
+CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS) $(check_SCRIPTS)
+EXTRA_DIST = \
+    autogen.sh \
+    barnowl-wrapper.in \
+    codelist.pl \
+    doc \
+    examples \
+    marshal_types \
+    perlglue.xs \
+    scripts \
+    stubgen.pl \
+    typemap
+
 SUBDIRS = compat libfaim perl