Changes in Makefile.am [3624a2c:353719a]

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 \
-     owl.c
-nodist_barnowl_bin_SOURCES = $(GEN_C) $(GEN_H)
+     owl.h owl_perl.h config.h \
+     owl.c \
+     $(GEN_C) $(GEN_H)
 
-dist_man_MANS = doc/barnowl.1
-dist_doc_DATA = doc/intro.txt doc/advanced.txt
+man_MANS = doc/barnowl.1
+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 \
+     owl.h owl_perl.h config.h \
+     $(GEN_C) $(GEN_H) \
      tester.c
-nodist_tester_bin_SOURCES = $(GEN_C) $(GEN_H)
 
 tester_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
@@ -44 +32 @@
 TESTS=runtests.sh
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS = -I$(top_srcdir)/ \
            -I$(top_srcdir)/libfaim/ \
            -DDATADIR='"$(pkgdatadir)"' \
@@ -60 +48 @@
      mainpanel.c msgwin.c sepbar.c editcontext.c signal.c closures.c
 
-NORMAL_SRCS = filterproc.c filterproc.h window.c window.h windowcb.c
+NORMAL_SRCS = filterproc.c window.c windowcb.c
 
 BASE_SRCS = $(CODELIST_SRCS) $(NORMAL_SRCS)
 
 GEN_C = varstubs.c perlglue.c gmarshal_funcs.c
-GEN_H = owl_prototypes.h owl_prototypes.h.new gmarshal_funcs.h
+GEN_H = owl_prototypes.h gmarshal_funcs.h
 
 BUILT_SOURCES = $(GEN_C) $(GEN_H)
@@ -78 +66 @@
 proto: owl_prototypes.h
 
-perlglue.c: perlglue.xs typemap
-        $(AM_V_GEN)perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes $< > $@
+perlglue.c: perlglue.xs $(TYPEMAP)
+        $(AM_V_GEN)perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes perlglue.xs > perlglue.c
 
 varstubs.c: stubgen.pl variable.c
@@ -96 +84 @@
         $(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:
@@ -101 +93 @@
               $(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