kopia lustrzana https://github.com/F5OEO/tstools
Fix lib generation
Cease trying to look inside .so from make and as we now want to keep the objects lying around move them to OBJDIR and always create the static lib from scratch rather than using ar on it one .o at a timemaster
rodzic
eeab436ddd
commit
6970a9f9ba
65
Makefile
65
Makefile
|
@ -93,31 +93,31 @@ BINDIR = bin
|
||||||
|
|
||||||
# All of our non-program object modules
|
# All of our non-program object modules
|
||||||
OBJS = \
|
OBJS = \
|
||||||
accessunit.o \
|
$(OBJDIR)/accessunit.o \
|
||||||
avs.o \
|
$(OBJDIR)/avs.o \
|
||||||
ac3.o \
|
$(OBJDIR)/ac3.o \
|
||||||
adts.o \
|
$(OBJDIR)/adts.o \
|
||||||
bitdata.o \
|
$(OBJDIR)/bitdata.o \
|
||||||
es.o \
|
$(OBJDIR)/es.o \
|
||||||
filter.o \
|
$(OBJDIR)/filter.o \
|
||||||
fmtx.o \
|
$(OBJDIR)/fmtx.o \
|
||||||
h222.o \
|
$(OBJDIR)/h222.o \
|
||||||
h262.o \
|
$(OBJDIR)/h262.o \
|
||||||
audio.o \
|
$(OBJDIR)/audio.o \
|
||||||
l2audio.o \
|
$(OBJDIR)/l2audio.o \
|
||||||
misc.o \
|
$(OBJDIR)/misc.o \
|
||||||
nalunit.o \
|
$(OBJDIR)/nalunit.o \
|
||||||
ps.o \
|
$(OBJDIR)/ps.o \
|
||||||
pes.o \
|
$(OBJDIR)/pes.o \
|
||||||
pidint.o \
|
$(OBJDIR)/pidint.o \
|
||||||
printing.o \
|
$(OBJDIR)/printing.o \
|
||||||
reverse.o \
|
$(OBJDIR)/reverse.o \
|
||||||
ts.o \
|
$(OBJDIR)/ts.o \
|
||||||
tsplay_innards.o \
|
$(OBJDIR)/tsplay_innards.o \
|
||||||
tswrite.o \
|
$(OBJDIR)/tswrite.o \
|
||||||
pcap.o \
|
$(OBJDIR)/pcap.o \
|
||||||
ethernet.o \
|
$(OBJDIR)/ethernet.o \
|
||||||
ipv4.o
|
$(OBJDIR)/ipv4.o
|
||||||
|
|
||||||
# Our program object modules
|
# Our program object modules
|
||||||
PROG_OBJS = \
|
PROG_OBJS = \
|
||||||
|
@ -212,8 +212,11 @@ $(STATIC_LIB): $(OBJS)
|
||||||
$(SHARED_LIB): $(OBJS)
|
$(SHARED_LIB): $(OBJS)
|
||||||
libtool -dynamic $(OBJS) -o $(SHARED_LIB)
|
libtool -dynamic $(OBJS) -o $(SHARED_LIB)
|
||||||
else
|
else
|
||||||
$(STATIC_LIB): $(STATIC_LIB)($(OBJS))
|
$(STATIC_LIB): $(OBJS)
|
||||||
$(SHARED_LIB): $(SHARED_LIB)($(OBJS))
|
rm -f $(STATIC_LIB)
|
||||||
|
ar rc $(STATIC_LIB) $(OBJS)
|
||||||
|
|
||||||
|
$(SHARED_LIB): $(OBJS)
|
||||||
$(LD) -shared -o $(SHARED_LIB) $(OBJS) -lc
|
$(LD) -shared -o $(SHARED_LIB) $(OBJS) -lc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -317,15 +320,18 @@ AUDIO_H = adts_fns.h l2audio_fns.h ac3_fns.h audio_fns.h audio_defns.h adts_defn
|
||||||
|
|
||||||
# Everyone depends upon the basic configuration file, and I assert they all
|
# Everyone depends upon the basic configuration file, and I assert they all
|
||||||
# want (or may want) printing...
|
# want (or may want) printing...
|
||||||
$(STATIC_LIB)($(OBJS)) $(SHARED_LIB)($(OBJS)) $(TEST_OBJS) $(PROG_OBJS): compat.h printing_fns.h
|
$(OBJS) $(TEST_OBJS) $(PROG_OBJS): compat.h printing_fns.h
|
||||||
|
|
||||||
# Which library modules depend on which header files is complex, so
|
# Which library modules depend on which header files is complex, so
|
||||||
# lets just be simple
|
# lets just be simple
|
||||||
$(STATIC_LIB)($(OBJS)) $(SHARED_LIB)($(OBJS)): \
|
$(OBJS): \
|
||||||
$(ACCESSUNIT_H) $(NALUNIT_H) $(TS_H) $(ES_H) $(PES_H) \
|
$(ACCESSUNIT_H) $(NALUNIT_H) $(TS_H) $(ES_H) $(PES_H) \
|
||||||
misc_fns.h printing_fns.h $(PS_H) $(H262_H) \
|
misc_fns.h printing_fns.h $(PS_H) $(H262_H) \
|
||||||
$(TSWRITE_H) $(AVS_H) $(REVERSE_H) $(FILTER_H) $(AUDIO_H)
|
$(TSWRITE_H) $(AVS_H) $(REVERSE_H) $(FILTER_H) $(AUDIO_H)
|
||||||
|
|
||||||
|
$(OBJDIR)/%.o: %.c
|
||||||
|
$(CC) -c $< -o $@ $(CFLAGS)
|
||||||
|
|
||||||
$(OBJDIR)/es2ts.o: es2ts.c $(ES_H) $(TS_H) misc_fns.h version.h
|
$(OBJDIR)/es2ts.o: es2ts.c $(ES_H) $(TS_H) misc_fns.h version.h
|
||||||
$(CC) -c $< -o $@ $(CFLAGS)
|
$(CC) -c $< -o $@ $(CFLAGS)
|
||||||
$(OBJDIR)/esdots.o: esdots.c misc_fns.h $(ACCESSUNIT_H) $(H262_H) version.h
|
$(OBJDIR)/esdots.o: esdots.c misc_fns.h $(ACCESSUNIT_H) $(H262_H) version.h
|
||||||
|
@ -416,6 +422,7 @@ objclean:
|
||||||
clean: objclean
|
clean: objclean
|
||||||
-rm -f $(PROGS)
|
-rm -f $(PROGS)
|
||||||
-rm -f $(STATIC_LIB)
|
-rm -f $(STATIC_LIB)
|
||||||
|
-rm -f $(SHARED_LIB)
|
||||||
-rm -f $(PROG_OBJS)
|
-rm -f $(PROG_OBJS)
|
||||||
|
|
||||||
.PHONY: distclean
|
.PHONY: distclean
|
||||||
|
|
Ładowanie…
Reference in New Issue