Skip to content

Commit

Permalink
Various cleanups so "make dist" works again, and builds a tarball
Browse files Browse the repository at this point in the history
  • Loading branch information
coppice-git committed Aug 14, 2023
1 parent aba9ac2 commit 64f4d2a
Show file tree
Hide file tree
Showing 81 changed files with 10,433 additions and 5,573 deletions.
1 change: 0 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ EXTRA_DIST = autogen.sh \
debian/libspandsp3-dev.install \
debian/libspandsp3-doc.install \
debian/rules \
debian/watch \
README.testdata \
spandsp.spec \
spandsp/fax-tests.dtd \
Expand Down
2 changes: 2 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -621,12 +621,14 @@ AC_CONFIG_FILES([Makefile
src/spandsp.h
spandsp-sim/Makefile
test-data/Makefile
test-data/bellcore/Makefile
test-data/etsi/Makefile
test-data/etsi/fax/Makefile
test-data/itu/Makefile
test-data/itu/fax/Makefile
test-data/itu/tiff-fx/Makefile
test-data/local/Makefile
test-data/mitel/Makefile
tests/Makefile
spandsp.pc])
# spandsp.spec])
Expand Down
5 changes: 4 additions & 1 deletion debian-prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Install the things which need adding to a fresh Debian 11 install to make it ready to build
# spandsp and its test suite
#
apt-get install fftw3-dev \
apt-get install libfftw3-dev \
libtiff-dev \
libtiff-tools \
libpcap-dev \
Expand All @@ -14,3 +14,6 @@ apt-get install fftw3-dev \
sox \
libtool \
netpbm

# doxygen \
# xsltproc
13 changes: 1 addition & 12 deletions spandsp-sim/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,8 @@ LIBS += -L$(top_builddir)/src -lspandsp $(SIMLIBS)
MAINTAINERCLEANFILES = Makefile.in

EXTRA_DIST = libspandsp_sim.dsp \
libspandsp_sim.2005.vcproj \
libspandsp_sim.2008.vcproj \
msvc/make_line_models.2008.vcproj \
msvc/msvcproj.head \
msvc/msvcproj.foot \
msvc/vc8proj.head \
msvc/vc8proj.foot \
msvc/vc9proj.head \
msvc/vc9proj.foot
msvc/msvcproj.foot

AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/src -DDATADIR="\"$(pkgdatadir)\""

Expand Down Expand Up @@ -70,15 +63,11 @@ line_models.c: make_line_models$(EXEEXT)
./make_line_models$(EXEEXT)

DSP = libspandsp_sim.dsp
VCPROJ8 = libspandsp_sim.2005.vcproj
VCPROJ9 = libspandsp_sim.2008.vcproj

WIN32SOURCES = $(libspandsp_sim_la_SOURCES)
WIN32HEADERS = $(nobase_include_HEADERS)

DSPOUT = | awk '{printf("%s\r\n", $$0)}' >> $(DSP)
VCPROJOUT8 = | awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ8)
VCPROJOUT9 = | awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ9)

$(DSP): msvc/msvcproj.head msvc/msvcproj.foot Makefile.am
echo "creating $(DSP)"
Expand Down
110 changes: 0 additions & 110 deletions spandsp-sim/libspandsp_sim.2005.vcproj

This file was deleted.

Loading

0 comments on commit 64f4d2a

Please sign in to comment.