diff options
| author | Michele Calgaro <[email protected]> | 2023-11-10 11:24:47 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2023-11-10 11:53:12 +0900 |
| commit | 2ec395712f961f8f634ffbb3ec9aa39b6095354a (patch) | |
| tree | 4c421689ac8288e9494af40ebe69b374d7e8667a /src/Makefile.am | |
| parent | c6e2acdd1c93e2ae86d47ad3a90bfb71aa4b2d51 (diff) | |
| download | soundkonverter-2ec395712f961f8f634ffbb3ec9aa39b6095354a.tar.gz soundkonverter-2ec395712f961f8f634ffbb3ec9aa39b6095354a.zip | |
Rename src/config.h to src/configuration.h to avoid possible conflicts with autogenerated config.h file
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit adcdf1d0d0ca100b319905e59e3e61394ba87117)
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 96add23..7b28f13 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/src/metadata/ \ -I$(top_srcdir)/src/pluginloader/ $(cdda_includes) # these are the headers for your project -noinst_HEADERS = cdmanager.h cdopener.h combobutton.h config.h \ +noinst_HEADERS = cdmanager.h cdopener.h combobutton.h configuration.h \ configbackendspage.h configdialog.h configenvironmentpage.h configgeneralpage.h \ configpagebase.h configpluginspage.h conversionoptions.h convert.h cuesheeteditor.h \ dcopinterface.h dirdialog.h filelist.h logger.h logviewer.h options.h optionsdetailed.h \ @@ -29,7 +29,7 @@ bin_PROGRAMS = soundkonverter # the application source, library search path, and link libraries soundkonverter_SOURCES = cddb.cpp cdmanager.cpp cdopener.cpp combobutton.cpp \ - config.cpp configbackendspage.cpp configdialog.cpp configenvironmentpage.cpp \ + configuration.cpp configbackendspage.cpp configdialog.cpp configenvironmentpage.cpp \ configgeneralpage.cpp configpagebase.cpp configpluginspage.cpp conversionoptions.cpp \ convert.cpp cuesheeteditor.cpp dcopinterface.skel dirdialog.cpp filelist.cpp \ logger.cpp logviewer.cpp main.cpp options.cpp optionsdetailed.cpp \ |