Merge branch 'split'

Author: LukashonakV

.github/workflows/build-and-test.yml

@@ -24,6 +24,8 @@ jobs:
       run: ./configure
     - name: Run make
       run: make CFLAGS='-Werror'
+#    - name: Run make distcheck
+#      run: make distcheck
     - name: Prepare tests
       run: |
         pulseaudio -D
@@ -37,9 +39,9 @@ jobs:
     - name: run shmem test
       run: ./cava -p example_files/test_configs/shmem_zero_test > /dev/null
     - name: build cavacore test application
-      run: gcc -c -g cavacore_test.c
+      run: gcc -I include -c -g cavacore_test.c
     - name: link cavacore test application
-      run: gcc -o cavacore_test cavacore_test.o src/cava-cavacore.o -lm -lfftw3
+      run: gcc -o cavacore_test cavacore_test.o cava-cavacore.o -lm -lfftw3
     - name: run cavacore test application
       run: ./cavacore_test
   build-linux-meson:
@@ -67,12 +69,11 @@ jobs:
     - name: run shmem test
       run: ./build/cava -p example_files/test_configs/shmem_zero_test > /dev/null
     - name: build cavacore test application
-      run: gcc -c -g cavacore_test.c
+      run: gcc -I include -c -g cavacore_test.c
     - name: link cavacore test application
-      run: gcc -o cavacore_test cavacore_test.c build/libcava.so.p/src_cavacore.c.o -lm -lfftw3
+      run: gcc -I include -o cavacore_test cavacore_test.c build/libcava.so.p/cavacore.c.o -lm -lfftw3
     - name: run cavacore test application
       run: ./cavacore_test
-
   build-macos:
     runs-on: macos-latest
     steps:

CMakeLists.txt

@@ -17,7 +17,7 @@ if (ANDROID)
 	if (NOT EXISTS "${FFTW_DIR}/obj/local/${CMAKE_ANDROID_ARCH_ABI}/")
 		message(FATAL_ERROR "given lib dir: ${FFTW_DIR}/obj/local/${CMAKE_ANDROID_ARCH_ABI}/ does not exist, did you build it? See cavandroid/README.md")
 	endif()
-	target_include_directories(cavacore PRIVATE "${FFTW_DIR}/jni/fftw3/api/")
+	target_include_directories(cavacore PRIVATE "${FFTW_DIR}/jni/fftw3/api/" include)
 	target_link_directories(cavacore PRIVATE "${FFTW_DIR}/obj/local/${CMAKE_ANDROID_ARCH_ABI}/")
 	target_link_libraries(cavacore fftw3)
 elseif(WIN32)
@@ -27,18 +27,17 @@ elseif(WIN32)
 	find_package(Threads)
 
 	add_executable(cava
-		src/cava.c
-		src/cavacore.c
-		src/config.c
-		src/common.c
-		src/input/common.c
-		src/input/winscap.c
-		src/output/common.c
-		src/output/sdl_cava.c
-		src/output/sdl_glsl.c
-		src/output/terminal_noncurses.c
-		src/output/raw.c
-		src/output/noritake.c
+		cava.c
+		cavacore.c
+		config.c
+		input/common.c
+		input/winscap.c
+        output/common.c
+		output/sdl_cava.c
+		output/sdl_glsl.c
+		output/terminal_noncurses.c
+		output/raw.c
+		output/noritake.c
 		cava_win/cava/cava.rc
 	)
 

Makefile.am

@@ -2,20 +2,66 @@ AUTOMAKE_OPTIONS = foreign
 
 ACLOCAL_AMFLAGS = -I m4
 
+CLEANFILES = $(NULL)
+
+# Install the pkgconfig file for the library
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libcava.pc
+
+# Generate the pkgconfig file
+libcava.pc: Makefile.am
+	@echo "Generating $@..."
+	@mkdir -p $(@D)
+	@echo "prefix=$(prefix)" > $@
+	@echo "exec_prefix=$(exec_prefix)" >> $@
+	@echo "libdir=$(libdir)" >> $@
+	@echo "includedir=$(includedir)" >> $@
+	@echo "Name: $(PKG_CONFIG_NAME)" >> $@
+	@echo "Description: $(PKG_CONFIG_DESC)" >> $@
+	@echo "Version: $(PKG_CONFIG_VERSION)" >> $@
+	@echo "Libs: -L\$(libdir) -lcava" >> $@ # Link against libcava library
+	@echo "Cflags: -I\$(includedir)/cava -I\$(includedir)/cava/input -I\$(includedir)/cava/output" >> $@
+
+# Clean up the generated pkgconfig file
+CLEANFILES += libcava.pc
+
+# Define the library to be built
+# 'lib' directory implies shared library by default with Automake.
+# Use 'noinst_LTLIBRARIES' if you don't want to install it but build it for internal use.
+lib_LTLIBRARIES = libcava.la
+
+AM_LIBTOOL_VERSION = $(AM_LIBTOOL_CURRENT):$(AM_LIBTOOL_REVISION):$(AM_LIBTOOL_RELEASE)
+AM_LIBTOOL_REL = $(AM_LIBTOOL_RELEASE):$(AM_LIBTOOL_REVISION):$(AM_LIBTOOL_CURRENT)
+
+libcava_la_LDFLAGS = -version-info $(AM_LIBTOOL_REL)
+
 bin_PROGRAMS = cava
+
 cavadir = $(top_srcdir)
-cava_SOURCES = src/cava.c src/cavacore.c src/common.c src/config.c src/input/common.c src/input/fifo.c src/input/shmem.c \
-               src/output/terminal_noncurses.c src/output/raw.c src/output/noritake.c src/output/common.c\
-               include/cava/cavacore.h include/cava/config.h include/cava/input/common.h include/cava/input/fifo.h include/cava/input/shmem.h \
-               include/cava/output/terminal_noncurses.h include/cava/output/raw.h include/cava/output/noritake.h \
-               include/cava/debug.h include/cava/util.h third_party/incbin.h
-cava_CPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" \
-           -D_POSIX_SOURCE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE_EXTENDED \
-           -DFONTDIR=\"@FONT_DIR@\" -DFONTFILE=\"@FONT_FILE@\" \
-           -I$(top_builddir) -I$(top_builddir)/include
+cava_SOURCES = cava.c
+libcava_la_SOURCES = cavacore.c config.c input/common.c input/fifo.c input/shmem.c \
+               output/common.c output/terminal_noncurses.c output/raw.c output/noritake.c
+
+cava_CPPFLAGS = \
+	-DPACKAGE=\"$(PACKAGE)\" \
+	-DVERSION=\"$(VERSION)\" \
+	-DLIB_VERSION=\"$(VERSION)\" \
+	-D_POSIX_SOURCE \
+	-D_POSIX_C_SOURCE=200809L \
+	-D_XOPEN_SOURCE_EXTENDED \
+	-DFONTDIR=\"@FONT_DIR@\" \
+	-DFONTFILE=\"@FONT_FILE@\" \
+	-I$(srcdir) \
+	-I$(srcfir)/input \
+	-I$(srcfir)/output \
+	-I$(srcdir)/include
+
+AM_CFLAGS = $(cava_CPPFLAGS)
+
 cava_CFLAGS = -std=c99 -Wall -Wextra -Wno-unused-result -Wno-unknown-warning-option -Wno-maybe-uninitialized -Wno-vla-parameter
 
 EXTRA_DIST = \
+	include \
     output/shaders/pass_through.vert \
     output/shaders/bar_spectrum.frag \
     output/shaders/northern_lights.frag \
@@ -32,6 +78,19 @@ EXTRA_DIST = \
     .clang-format \
     CMakeLists.txt
 
+# Install entire directories preserving structure
+dist-hook:
+	cp -r include/cava $(DESTDIR)$(includedir)
+# Define the target to install the headers
+install-exec-hook:
+	@$(MKDIR_P) $(DESTDIR)$(includedir)/cava
+# Install entire directories preserving structure
+install-data-hook:
+	cp -r include/cava/* $(DESTDIR)$(includedir)/cava/
+# Define uninstall hook to remove the directory
+uninstall-hook:
+	$(AM_V_GEN) rm -rf "$(DESTDIR)$(includedir)/cava"
+
 if OSX
     cava_CFLAGS += -DNORT
     cava_LDADD =
@@ -43,7 +102,7 @@ endif
 
 if FREEBSD
 if CAVAFONT
-    CLEANFILES = cava.bdf cava.fnt
+    CLEANFILES += cava.bdf cava.fnt
 
 cava.fnt: ${srcdir}/cava.psf
 	${PSF2BDF} --fontname="-gnu-cava-medium-r-normal--16-160-75-75-c-80-iso10646-1" ${srcdir}/cava.psf cava.bdf
@@ -52,43 +111,45 @@ endif
 endif
 
 if ALSA
-    cava_SOURCES += src/input/alsa.c include/cava/input/alsa.h
+    libcava_la_SOURCES += input/alsa.c input/alsa.h
 endif
 
 if PORTAUDIO
-    cava_SOURCES += src/input/portaudio.c include/cava/input/portaudio.h
+    libcava_la_SOURCES += input/portaudio.c input/portaudio.h
 endif
 
 if PIPEWIRE
-    cava_SOURCES += src/input/pipewire.c include/cava/input/pipewire.h
+    libcava_la_SOURCES += input/pipewire.c input/pipewire.h
 endif
 
 if PULSE
-    cava_SOURCES += src/input/pulse.c include/cava/input/pulse.h
+    libcava_la_SOURCES += input/pulse.c input/pulse.h
 endif
 
 if SNDIO
-    cava_SOURCES += src/input/sndio.c include/cava/input/sndio.h
+    libcava_la_SOURCES += input/sndio.c input/sndio.h
 endif
 
 if OSS
-    cava_SOURCES += src/input/oss.c include/cava/input/oss.h
+    libcava_la_SOURCES += input/oss.c input/oss.h
 endif
 
 if JACK
-    cava_SOURCES += src/input/jack.c include/cava/input/jack.h
+    libcava_la_SOURCES += input/jack.c input/jack.h
 endif
 
 if NCURSES
-    cava_SOURCES += src/output/terminal_ncurses.c src/output/terminal_bcircle.c \
-                    include/cava/output/terminal_ncurses.h include/cava/output/terminal_bcircle.h
+    libcava_la_SOURCES += output/terminal_ncurses.c output/terminal_bcircle.c \
+                    output/terminal_ncurses.h output/terminal_bcircle.h
 
 endif
 
 if SDL
-    cava_SOURCES += src/output/sdl_cava.c include/cava/output/sdl_cava.h
+    libcava_la_SOURCES += output/sdl_cava.c output/sdl_cava.h
 endif
 
 if SDL_GLSL
-    cava_SOURCES += src/output/sdl_glsl.c include/cava/output/sdl_glsl.h
+    libcava_la_SOURCES += output/sdl_glsl.c output/sdl_glsl.h
 endif
+
+cava_SOURCES += $(libcava_la_SOURCES)

autogen.sh

@@ -5,7 +5,7 @@ set -e
 if [ -d .git ]; then
   git describe --always --tags --dirty > version # get version from git
 else
-  echo 0.10.6 > version # hard coded versions
+  echo 0.10.7 > version # hard coded versions
 fi
 
 libtoolize