From: Steinar H. Gunderson Date: Sun, 16 Mar 2014 20:08:28 +0000 (+0100) Subject: Make a 'make dist' target. X-Git-Tag: 1.0~1 X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=ab9c8178e08a02283be206ea56dc91206512ca87 Make a 'make dist' target. --- diff --git a/Makefile.in b/Makefile.in index 2cd3e77..e5f8ac9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -7,6 +7,7 @@ GTEST_DIR ?= /usr/src/gtest # whenever it breaks, so that you will not have silent failures, and distribution package # management can run its course. movit_ltversion = 1:0:0 +movit_version = 1.0 prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -90,7 +91,8 @@ all: demo endif # Google Test and other test library functions. -TEST_OBJS = gtest-all.o gtest_sdl_main.o test_util.o +OWN_TEST_OBJS = gtest_sdl_main.o test_util.o +TEST_OBJS = gtest-all.o $(OWN_TEST_OBJS) gtest-all.o: $(GTEST_DIR)/src/gtest-all.cc $(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@ @@ -101,6 +103,7 @@ gtest_sdl_main.o: gtest_sdl_main.cpp $(TESTS): %: %.o $(TEST_OBJS) libmovit.la $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) +OWN_OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(OWN_TEST_OBJS) $(TESTS:=.o) OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o) # A small demo program. @@ -175,4 +178,17 @@ install: libmovit.la $(MKDIR) -p $(libdir)/pkgconfig/ $(INSTALL) -m 644 movit.pc $(libdir)/pkgconfig/ -.PHONY: coverage clean distclean check all install +DISTDIR=movit-$(movit_version) +OTHER_DIST_FILES=add.frag autogen.sh blue.frag configure.ac d65.h effectlist.txt identity.frag invert_effect.frag Makefile.in mipmap_needing_effect.frag movit.pc.in README test_util.h widgets.h + +dist: + $(MKDIR) $(DISTDIR) + cp $(OWN_OBJS:.o=.cpp) $(DISTDIR)/ + cp $(HDRS) $(DISTDIR)/ + cp $(SHADERS) $(DISTDIR)/ + cp $(OTHER_DIST_FILES) $(DISTDIR)/ + ( cd $(DISTDIR) && aclocal && libtoolize --install --copy && autoconf && $(RM) -r autom4te.cache/ ) + tar zcvvf ../$(DISTDIR).tar.gz $(DISTDIR) + $(RM) -r $(DISTDIR) + +.PHONY: coverage clean distclean check all install dist diff --git a/configure.ac b/configure.ac index 3e0b1be..93e168b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,10 @@ AC_CONFIG_MACRO_DIR([m4]) AC_INIT(movit, git) LT_INIT +PKG_PROG_PKG_CONFIG AC_CONFIG_SRCDIR(effect.cpp) +AC_CONFIG_AUX_DIR(.) AC_PROG_CC AC_PROG_CXX