Merge branch 'refactor'

seperate out src
whatdoineed2do · Jan 17, 2024 · 69736cf · 69736cf
2 parents b09ee7a + 064be68
commit 69736cf
Show file tree

Hide file tree

Showing 35 changed files with 72 additions and 47 deletions.
diff --git a/configure.ac b/configure.ac
@@ -13,6 +13,8 @@ AC_PROG_INSTALL
 LT_INIT
 PKG_PROG_PKG_CONFIG
 
+AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
+
 PKG_CHECK_MODULES(IMAGEMAGICK, [Magick++ >= 6.9.9])
 PKG_CHECK_MODULES(EXIV,        [exiv2 >= 0.25])
 PKG_CHECK_MODULES(AVFORMAT,    [libavformat >= 57.71.100])
@@ -32,6 +34,9 @@ fi
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
+src/lib/Makefile
+src/cat/Makefile
+src/extract/Makefile
 tests/Makefile
 ])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,46 +1,4 @@
-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
+AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = lib cat extract
 
-AM_CPPFLAGS = -DHAVE_SAMPLE_ICC -DNEED_UCHAR_UINT_T
-AM_CXXFLAGS = -std=c++17 $(IMAGEMAGICK_CFLAGS) $(EXIV_CFLAGS) $(SAMPLEICC_CFLAGS) -Wno-deprecated -Wno-pointer-arith -fopenmp -pthread
-AM_LDFLAGS = $(IMAGEMAGICK_LIBS) $(EXIV_LIBS) -fopenmp -pthread
-
-noinst_LTLIBRARIES = libimgcat_helper.la libimgcat.la
-
-bin_PROGRAMS = imgcat imgprextr
-
-libimgcat_helper_la_CPPFLAGS = $(AM_CPPFLAGS)
-libimgcat_helper_la_CXXFLAGS = $(AM_CXXFLAGS)
-libimgcat_helper_la_LDFLAGS = $(AM_LDFLAGS)
-libimgcat_helper_la_LIBADD = $(SAMPLEICC_LIBS)
-libimgcat_helper_la_SOURCES = \
-    ICCprofiles.c \
-    version.cc
-
-libimgcat_la_CPPFLAGS = $(AM_CPPFLAGS)
-libimgcat_la_CXXFLAGS = $(AM_CXXFLAGS) $(FFMPEGTHUMB_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(AVCODEC_CFLAGS) $(AVFILTER_CFLAGS)
-libimgcat_la_LDFLAGS = $(AM_LDFLAGS) $(FFMPEGTHUMB_LIBS) $(AVFORMAT_LIBS) $(AVFILTER_LIBS) $(AVUTIL_LIBS) $(AVCODEC_LIBS)
-libimgcat_la_LIBADD = $(SAMPLEICC_LIBS)
-libimgcat_la_SOURCES = \
-    ImgData.cc  \
-    ImgMetaParser.cc  \
-    ImgExifParser.cc  \
-    ImgOut.cc  \
-    ImgOutJson.cc  \
-    ImgHtml.cc  \
-    ImgHtmlJG.cc \
-    ImgAVFmtParser.cc \
-    ImgIdx.cc  \
-    ImgKey.cc \
-    ImgThumbGen.cc 
-
-imgcat_CPPFLAGS = $(AM_CPPFLAGS)
-imgcat_CXXFLAGS = $(AM_CXXFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(FFMPEGTHUMB_CFLAGS)
-imgcat_LDFLAGS = $(AM_LDFLAGS) $(FFMPEGTHUMB_LIBS) $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) -lpng -ljpeg
-imgcat_LDADD = $(SAMPLEICC_LIBS) libimgcat.la libimgcat_helper.la
-imgcat_SOURCES = imgcat.cc 
-
-imgprextr_CPPFLAGS = $(AM_CPPFLAGS)
-imgprextr_CXXFLAGS = $(AM_CXXFLAGS)
-imgprextr_LDFLAGS = $(AM_LDFLAGS)
-imgprextr_LDADD = $(SAMPLEICC_LIBS) libimgcat_helper.la
-imgprextr_SOURCES = imgprextr.cc
diff --git a/src/Img.h → src/cat/Img.h b/src/Img.h → src/cat/Img.h
diff --git a/src/ImgAVFmtParser.cc → src/cat/ImgAVFmtParser.cc b/src/ImgAVFmtParser.cc → src/cat/ImgAVFmtParser.cc
diff --git a/src/ImgAVFmtParser.h → src/cat/ImgAVFmtParser.h b/src/ImgAVFmtParser.h → src/cat/ImgAVFmtParser.h
diff --git a/src/ImgData.cc → src/cat/ImgData.cc b/src/ImgData.cc → src/cat/ImgData.cc
diff --git a/src/ImgData.h → src/cat/ImgData.h b/src/ImgData.h → src/cat/ImgData.h
diff --git a/src/ImgExifParser.cc → src/cat/ImgExifParser.cc b/src/ImgExifParser.cc → src/cat/ImgExifParser.cc
diff --git a/src/ImgExifParser.h → src/cat/ImgExifParser.h b/src/ImgExifParser.h → src/cat/ImgExifParser.h
diff --git a/src/ImgHtml.cc → src/cat/ImgHtml.cc b/src/ImgHtml.cc → src/cat/ImgHtml.cc
diff --git a/src/ImgHtml.h → src/cat/ImgHtml.h b/src/ImgHtml.h → src/cat/ImgHtml.h
diff --git a/src/ImgHtmlJG.cc → src/cat/ImgHtmlJG.cc b/src/ImgHtmlJG.cc → src/cat/ImgHtmlJG.cc
diff --git a/src/ImgIdx.cc → src/cat/ImgIdx.cc b/src/ImgIdx.cc → src/cat/ImgIdx.cc
diff --git a/src/ImgIdx.h → src/cat/ImgIdx.h b/src/ImgIdx.h → src/cat/ImgIdx.h
diff --git a/src/ImgKey.cc → src/cat/ImgKey.cc b/src/ImgKey.cc → src/cat/ImgKey.cc
diff --git a/src/ImgKey.h → src/cat/ImgKey.h b/src/ImgKey.h → src/cat/ImgKey.h
diff --git a/src/ImgMetaParser.cc → src/cat/ImgMetaParser.cc b/src/ImgMetaParser.cc → src/cat/ImgMetaParser.cc
diff --git a/src/ImgMetaParser.h → src/cat/ImgMetaParser.h b/src/ImgMetaParser.h → src/cat/ImgMetaParser.h
diff --git a/src/ImgOut.cc → src/cat/ImgOut.cc b/src/ImgOut.cc → src/cat/ImgOut.cc
diff --git a/src/ImgOut.h → src/cat/ImgOut.h b/src/ImgOut.h → src/cat/ImgOut.h
diff --git a/src/ImgOutJson.cc → src/cat/ImgOutJson.cc b/src/ImgOutJson.cc → src/cat/ImgOutJson.cc
diff --git a/src/ImgOutJson.h → src/cat/ImgOutJson.h b/src/ImgOutJson.h → src/cat/ImgOutJson.h
diff --git a/src/ImgThumbGen.cc → src/cat/ImgThumbGen.cc b/src/ImgThumbGen.cc → src/cat/ImgThumbGen.cc
diff --git a/src/ImgThumbGen.h → src/cat/ImgThumbGen.h b/src/ImgThumbGen.h → src/cat/ImgThumbGen.h
diff --git a/src/cat/Makefile.am b/src/cat/Makefile.am
@@ -0,0 +1,32 @@
+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
+
+AM_CPPFLAGS = -DHAVE_SAMPLE_ICC -DNEED_UCHAR_UINT_T
+AM_CXXFLAGS = $(IMAGEMAGICK_CFLAGS) $(EXIV_CFLAGS) $(SAMPLEICC_CFLAGS) -I../lib -Wno-deprecated -Wno-pointer-arith -fopenmp -pthread
+AM_LDFLAGS = $(IMAGEMAGICK_LIBS) $(EXIV_LIBS) -fopenmp -pthread -L../lib
+
+noinst_LTLIBRARIES = libimgcat.la
+
+bin_PROGRAMS = imgcat
+
+libimgcat_la_CPPFLAGS = $(AM_CPPFLAGS)
+libimgcat_la_CXXFLAGS = $(AM_CXXFLAGS) $(FFMPEGTHUMB_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(AVCODEC_CFLAGS) $(AVFILTER_CFLAGS)
+libimgcat_la_LDFLAGS = $(AM_LDFLAGS) $(FFMPEGTHUMB_LIBS) $(AVFORMAT_LIBS) $(AVFILTER_LIBS) $(AVUTIL_LIBS) $(AVCODEC_LIBS)
+libimgcat_la_LIBADD = $(SAMPLEICC_LIBS)
+libimgcat_la_SOURCES = \
+    ImgData.cc  \
+    ImgMetaParser.cc  \
+    ImgExifParser.cc  \
+    ImgOut.cc  \
+    ImgOutJson.cc  \
+    ImgHtml.cc  \
+    ImgHtmlJG.cc \
+    ImgAVFmtParser.cc \
+    ImgIdx.cc  \
+    ImgKey.cc \
+    ImgThumbGen.cc 
+
+imgcat_CPPFLAGS = $(AM_CPPFLAGS)
+imgcat_CXXFLAGS = $(AM_CXXFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(FFMPEGTHUMB_CFLAGS)
+imgcat_LDFLAGS = $(AM_LDFLAGS) $(FFMPEGTHUMB_LIBS) $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) -lpng -ljpeg
+imgcat_LDADD = $(SAMPLEICC_LIBS) libimgcat.la -limgcat_helper
+imgcat_SOURCES = imgcat.cc 
diff --git a/src/imgcat.cc → src/cat/imgcat.cc b/src/imgcat.cc → src/cat/imgcat.cc
diff --git a/src/extract/Makefile.am b/src/extract/Makefile.am
@@ -0,0 +1,15 @@
+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
+
+AM_CPPFLAGS = -DHAVE_SAMPLE_ICC -DNEED_UCHAR_UINT_T
+AM_CXXFLAGS = $(IMAGEMAGICK_CFLAGS) $(EXIV_CFLAGS) $(SAMPLEICC_CFLAGS) -I../lib -Wno-deprecated -Wno-pointer-arith -fopenmp -pthread
+AM_LDFLAGS = $(IMAGEMAGICK_LIBS) $(EXIV_LIBS) -L../lib -fopenmp -pthread
+
+noinst_LTLIBRARIES = 
+
+bin_PROGRAMS = imgprextr
+
+imgprextr_CPPFLAGS = $(AM_CPPFLAGS)
+imgprextr_CXXFLAGS = $(AM_CXXFLAGS)
+imgprextr_LDFLAGS = $(AM_LDFLAGS)
+imgprextr_LDADD = $(SAMPLEICC_LIBS) -limgcat_helper
+imgprextr_SOURCES = imgprextr.cc
diff --git a/src/imgprextr.cc → src/extract/imgprextr.cc b/src/imgprextr.cc → src/extract/imgprextr.cc
diff --git a/src/ICCprofiles.c → src/lib/ICCprofiles.c b/src/ICCprofiles.c → src/lib/ICCprofiles.c
diff --git a/src/ICCprofiles.h → src/lib/ICCprofiles.h b/src/ICCprofiles.h → src/lib/ICCprofiles.h
diff --git a/src/ImgBuf.h → src/lib/ImgBuf.h b/src/ImgBuf.h → src/lib/ImgBuf.h
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
@@ -0,0 +1,15 @@
+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
+
+AM_CPPFLAGS = -DHAVE_SAMPLE_ICC -DNEED_UCHAR_UINT_T
+AM_CXXFLAGS = $(IMAGEMAGICK_CFLAGS) $(EXIV_CFLAGS) $(SAMPLEICC_CFLAGS) -Wno-deprecated -Wno-pointer-arith -fopenmp -pthread
+AM_LDFLAGS = $(IMAGEMAGICK_LIBS) $(EXIV_LIBS)
+
+noinst_LTLIBRARIES = libimgcat_helper.la
+
+libimgcat_helper_la_CPPFLAGS = $(AM_CPPFLAGS)
+libimgcat_helper_la_CXXFLAGS = $(AM_CXXFLAGS)
+libimgcat_helper_la_LDFLAGS = $(AM_LDFLAGS)
+libimgcat_helper_la_LIBADD = $(SAMPLEICC_LIBS)
+libimgcat_helper_la_SOURCES = \
+    ICCprofiles.c \
+    version.cc
diff --git a/src/version.cc → src/lib/version.cc b/src/version.cc → src/lib/version.cc
diff --git a/src/version.h → src/lib/version.h b/src/version.h → src/lib/version.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -9,13 +9,13 @@ bin_PROGRAMS = imagickICCconvert avinfo exiv
 imagickICCconvert_CPPFLAGS = $(AM_CPPFLAGS)
 imagickICCconvert_CXXFLAGS = $(AM_CXXFLAGS) $(IMAGEMAGICK_CFLAGS)
 imagickICCconvert_LDFLAGS = $(IMAGEMAGICK_LIBS)
-imagickICCconvert_LDADD = ../src/libimgcat.la
+imagickICCconvert_LDADD = ../src/cat/libimgcat.la
 imagickICCconvert_SOURCES = imagickICCconvert.cc
 
 avinfo_CPPFLAGS = $(AM_CPPFLAGS)
 avinfo_CXXFLAGS = $(AM_CXXFLAGS) $(AVUTIL_CFLAGS) $(AVFORMAT_CFLAGS)
 avinfo_LDFLAGS = $(AM_LDFLAGS) $(AVUTIL_LIBS) $(AVFORMAT_LIBS)
-avinfo_LDADD = ../src/libimgcat.la
+avinfo_LDADD = ../src/cat/libimgcat.la
 avinfo_SOURCES = avinfo.cc
 
 exiv_CPPFLAGS = $(AM_CPPFLAGS)