Revert "Recombine sources"

This reverts commit d3ae487.
aizvorski · Nov 6, 2023 · cdc8e76 · cdc8e76
1 parent f221371
commit cdc8e76
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 12 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -9,16 +9,16 @@ bin_PROGRAMS = h264_analyze svc_split
 lib_LTLIBRARIES = libh264bitstream.la
 
 libh264bitstream_la_LDFLAGS = -no-undefined
-libh264bitstream_la_SOURCES = src/h264_stream.c src/h264_sei.c src/h264_nal.c
+libh264bitstream_la_SOURCES = h264_stream.c h264_sei.c h264_nal.c
 
-h264_analyze_SOURCES = src/h264_analyze.c
+h264_analyze_SOURCES = h264_analyze.c
 h264_analyze_LDADD = libh264bitstream.la
 
-svc_split_SOURCES = src/svc_split.c
+svc_split_SOURCES = svc_split.c
 svc_split_LDADD = libh264bitstream.la
 
-include_HEADERS = src/h264_stream.h src/h264_sei.h src/h264_avcc.h
-pkginclude_HEADERS = src/h264_stream.h src/h264_sei.h src/h264_avcc.h src/bs.h
+include_HEADERS = h264_stream.h h264_sei.h h264_avcc.h
+pkginclude_HEADERS = h264_stream.h h264_sei.h h264_avcc.h bs.h
 
 clean-local:
 	rm -rf *.pc

diff --git a/Makefile.unix b/Makefile.unix
@@ -28,19 +28,19 @@ all: libh264bitstream.a $(BINARIES)
 h264_analyze: h264_analyze.o libh264bitstream.a
 	$(LD) $(LDFLAGS) -o h264_analyze h264_analyze.o -L. -lh264bitstream -lm
 
-libh264bitstream.a: src/h264_stream.c src/h264_nal.c src/h264_stream.h src/h264_slice_data.c src/h264_slice_data.h src/h264_sei.c src/h264_sei.h 
-	$(CC) $(CFLAGS) -c -o h264_nal.o src/h264_nal.c
-	$(CC) $(CFLAGS) -c -o h264_stream.o src/h264_stream.c
-	$(CC) $(CFLAGS) -c -o h264_slice_data.o src/h264_slice_data.c
-	$(CC) $(CFLAGS) -c -o h264_sei.o src/h264_sei.c
+libh264bitstream.a: h264_stream.c h264_nal.c h264_stream.h h264_slice_data.c h264_slice_data.h h264_sei.c h264_sei.h 
+	$(CC) $(CFLAGS) -c -o h264_nal.o h264_nal.c
+	$(CC) $(CFLAGS) -c -o h264_stream.o h264_stream.c
+	$(CC) $(CFLAGS) -c -o h264_slice_data.o h264_slice_data.c
+	$(CC) $(CFLAGS) -c -o h264_sei.o h264_sei.c
 	$(AR) $(ARFLAGS) libh264bitstream.a h264_stream.o h264_nal.o h264_slice_data.o h264_sei.o  
 
 
 clean:
 	rm -f *.o libh264bitstream.a $(BINARIES)
 	rm -f libh264bitstream-uninstalled.sh libh264bitstream.pc.in
 
-dox: src/h264_stream.c src/h264_stream.h src/bs.h Doxyfile
+dox: h264_stream.c h264_stream.h bs.h Doxyfile
 	doxygen Doxyfile
 
 dist: clean

diff --git a/src/bs.h → bs.h b/src/bs.h → bs.h
diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT([h264bitstream],[0.2.0],[[email protected]])
 
-AC_CONFIG_SRCDIR(./src/h264_stream.c)
+AC_CONFIG_SRCDIR(./h264_stream.c)
 
 AC_CONFIG_AUX_DIR(build-aux)
 

diff --git a/src/h264_analyze.c → h264_analyze.c b/src/h264_analyze.c → h264_analyze.c
diff --git a/src/h264_avcc.c → h264_avcc.c b/src/h264_avcc.c → h264_avcc.c
diff --git a/src/h264_avcc.h → h264_avcc.h b/src/h264_avcc.h → h264_avcc.h
diff --git a/src/h264_nal.c → h264_nal.c b/src/h264_nal.c → h264_nal.c
diff --git a/src/h264_sei.c → h264_sei.c b/src/h264_sei.c → h264_sei.c
diff --git a/src/h264_sei.h → h264_sei.h b/src/h264_sei.h → h264_sei.h
diff --git a/src/h264_sei.in.c → h264_sei.in.c b/src/h264_sei.in.c → h264_sei.in.c
diff --git a/src/h264_slice_data.c → h264_slice_data.c b/src/h264_slice_data.c → h264_slice_data.c
diff --git a/src/h264_slice_data.h → h264_slice_data.h b/src/h264_slice_data.h → h264_slice_data.h
diff --git a/src/h264_slice_data.in.c → h264_slice_data.in.c b/src/h264_slice_data.in.c → h264_slice_data.in.c
diff --git a/src/h264_stream.c → h264_stream.c b/src/h264_stream.c → h264_stream.c
diff --git a/src/h264_stream.h → h264_stream.h b/src/h264_stream.h → h264_stream.h
diff --git a/src/h264_stream.in.c → h264_stream.in.c b/src/h264_stream.in.c → h264_stream.in.c
diff --git a/src/svc_split.c → svc_split.c b/src/svc_split.c → svc_split.c