From 055b71a4e6caa57ee48664a76f327763d2ddfc56 Mon Sep 17 00:00:00 2001 From: Mischa Spiegelmock Date: Tue, 3 Apr 2018 00:00:38 -0700 Subject: [PATCH] fixing merge --- configure.ac | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index e1c4a68ca..c81e158d7 100644 --- a/configure.ac +++ b/configure.ac @@ -19,6 +19,7 @@ AC_CONFIG_FILES([ src/libprojectM/Renderer/Makefile src/libprojectM/NativePresetFactory/Makefile src/libprojectM/MilkdropPresetFactory/Makefile + src/NativePresets/Makefile ]) dnl SDL @@ -33,20 +34,8 @@ AS_IF([test "x$enable_sdl" = "xyes"], [ AC_CONFIG_FILES([src/projectM-sdl/Makefile]) ]) -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_FILES([ - Makefile - src/Makefile - src/libprojectM/Makefile - src/libprojectM/Renderer/Makefile - src/libprojectM/NativePresetFactory/Makefile - src/libprojectM/MilkdropPresetFactory/Makefile - src/NativePresets/Makefile -]) - dnl from https://stackoverflow.com/questions/30897170/ac-subst-does-not-expand-variable answer: https://stackoverflow.com/a/30960268 dnl ptomato https://stackoverflow.com/users/172999/ptomato - AC_SUBST([PACKAGE]) AC_PROG_SED AC_CONFIG_FILES([src/libprojectM/config.inp.in])