kopia lustrzana https://github.com/F5OEO/tstools
Previously, doing::
make make clean did not delete all the binaries. Now, target objclean does what clean used to do, and clean/distclean act more conventionally. Also, Makefile.osx *should* now be a suitable makefile for Linux/BSD as well -- but wait until I can test it at work (on Linux) before making it the "main" Makefile. --HG-- extra : convert_revision : svn%3Aeff31bef-be4a-0410-a8fe-e47997df2690/trunk%4010issue20
rodzic
24485ea59f
commit
3d1ec70f5b
11
Makefile
11
Makefile
|
@ -332,8 +332,8 @@ $(BINDIR):
|
||||||
mkdir $(BINDIR)
|
mkdir $(BINDIR)
|
||||||
|
|
||||||
# ------------------------------------------------------------
|
# ------------------------------------------------------------
|
||||||
.PHONY: clean
|
.PHONY: objclean
|
||||||
clean:
|
objclean:
|
||||||
-rm -f $(OBJS)
|
-rm -f $(OBJS)
|
||||||
-rm -f $(TEST_OBJS)
|
-rm -f $(TEST_OBJS)
|
||||||
-rm -f $(TEST_PROGS)
|
-rm -f $(TEST_PROGS)
|
||||||
|
@ -345,11 +345,14 @@ clean:
|
||||||
-rm -f es_test_b.ts es_test_b.264
|
-rm -f es_test_b.ts es_test_b.264
|
||||||
-rm -f *.core
|
-rm -f *.core
|
||||||
|
|
||||||
.PHONY: distclean
|
.PHONY: clean
|
||||||
distclean: clean
|
clean: objclean
|
||||||
-rm -f $(PROGS)
|
-rm -f $(PROGS)
|
||||||
-rm -f $(LIB)
|
-rm -f $(LIB)
|
||||||
-rm -f $(PROG_OBJS)
|
-rm -f $(PROG_OBJS)
|
||||||
|
|
||||||
|
.PHONY: distclean
|
||||||
|
distclean: clean
|
||||||
-rmdir $(OBJDIR)
|
-rmdir $(OBJDIR)
|
||||||
-rmdir $(LIBDIR)
|
-rmdir $(LIBDIR)
|
||||||
-rmdir $(BINDIR)
|
-rmdir $(BINDIR)
|
||||||
|
|
33
Makefile.osx
33
Makefile.osx
|
@ -69,8 +69,15 @@ endif
|
||||||
# the flags will have any effect either.
|
# the flags will have any effect either.
|
||||||
LFS_FLAGS = -D_FILE_OFFSET_BITS=64
|
LFS_FLAGS = -D_FILE_OFFSET_BITS=64
|
||||||
|
|
||||||
# Experimentally, for Mac OS/X
|
# Try for a best guess whether this is a Mac running OS/X, or some other
|
||||||
ARCH_FLAGS = -arch ppc -arch i386
|
# sort of thing (presumably Linux or BSD)
|
||||||
|
ifeq ($(shell uname -s), Darwin)
|
||||||
|
SYSTEM = "macosx"
|
||||||
|
ARCH_FLAGS = -arch ppc -arch i386
|
||||||
|
else
|
||||||
|
SYSTEM = "other"
|
||||||
|
ARCH_FLAGS =
|
||||||
|
endif
|
||||||
|
|
||||||
CFLAGS = $(WARNING_FLAGS) $(OPTIMISE_FLAGS) $(LFS_FLAGS) -I. $(PROFILE_FLAGS) $(ARCH_FLAGS)
|
CFLAGS = $(WARNING_FLAGS) $(OPTIMISE_FLAGS) $(LFS_FLAGS) -I. $(PROFILE_FLAGS) $(ARCH_FLAGS)
|
||||||
LDFLAGS = -g -lm $(PROFILE_FLAGS) $(ARCH_FLAGS)
|
LDFLAGS = -g -lm $(PROFILE_FLAGS) $(ARCH_FLAGS)
|
||||||
|
@ -87,6 +94,7 @@ SRCS = \
|
||||||
avs.c \
|
avs.c \
|
||||||
bitdata.c \
|
bitdata.c \
|
||||||
es.c \
|
es.c \
|
||||||
|
fmtx.c \
|
||||||
h262.c \
|
h262.c \
|
||||||
audio.c \
|
audio.c \
|
||||||
l2audio.c \
|
l2audio.c \
|
||||||
|
@ -106,6 +114,7 @@ OBJS = \
|
||||||
bitdata.o \
|
bitdata.o \
|
||||||
es.o \
|
es.o \
|
||||||
filter.o \
|
filter.o \
|
||||||
|
fmtx.o \
|
||||||
h262.o \
|
h262.o \
|
||||||
audio.o \
|
audio.o \
|
||||||
l2audio.o \
|
l2audio.o \
|
||||||
|
@ -187,10 +196,13 @@ all: $(BINDIR) $(LIBDIR) $(OBJDIR) $(PROGS)
|
||||||
.PHONY: ts2ps
|
.PHONY: ts2ps
|
||||||
ts2ps: $(TS2PS_PROG)
|
ts2ps: $(TS2PS_PROG)
|
||||||
|
|
||||||
#$(LIB): $(LIB)($(OBJS))
|
ifeq ($(shell uname -s), Darwin)
|
||||||
# Try getting a library containing universal objects on Mac
|
# Try getting a library containing universal objects on Mac
|
||||||
$(LIB): $(OBJS)
|
$(LIB): $(OBJS)
|
||||||
libtool -static $(OBJS) -o $(LIB)
|
libtool -static $(OBJS) -o $(LIB)
|
||||||
|
else
|
||||||
|
$(LIB): $(LIB)($(OBJS))
|
||||||
|
endif
|
||||||
|
|
||||||
$(BINDIR)/esfilter: $(OBJDIR)/esfilter.o $(LIB)
|
$(BINDIR)/esfilter: $(OBJDIR)/esfilter.o $(LIB)
|
||||||
$(CC) $< -o $(BINDIR)/esfilter $(LDFLAGS) $(LIBOPTS)
|
$(CC) $< -o $(BINDIR)/esfilter $(LDFLAGS) $(LIBOPTS)
|
||||||
|
@ -290,6 +302,8 @@ $(OBJDIR)/esmerge.o: esmerge.c misc_fns.h $(ACCESSUNIT_H) $(AUDIO_H) $(TSWRI
|
||||||
$(CC) -c $< -o $@ $(CFLAGS)
|
$(CC) -c $< -o $@ $(CFLAGS)
|
||||||
$(OBJDIR)/esreverse.o: esreverse.c $(TS_H) $(REVERSE_H) misc_fns.h $(ACCESSUNIT_H) $(H262_H) version.h
|
$(OBJDIR)/esreverse.o: esreverse.c $(TS_H) $(REVERSE_H) misc_fns.h $(ACCESSUNIT_H) $(H262_H) version.h
|
||||||
$(CC) -c $< -o $@ $(CFLAGS)
|
$(CC) -c $< -o $@ $(CFLAGS)
|
||||||
|
$(OBJDIR)/fmtx.o: fmtx.c fmtx.h
|
||||||
|
$(CC) -c $< -o $@ $(CFLAGS)
|
||||||
$(OBJDIR)/psreport.o: psreport.c $(ES_H) $(PS_H) version.h
|
$(OBJDIR)/psreport.o: psreport.c $(ES_H) $(PS_H) version.h
|
||||||
$(CC) -c $< -o $@ $(CFLAGS)
|
$(CC) -c $< -o $@ $(CFLAGS)
|
||||||
$(OBJDIR)/psdots.o: psdots.c $(ES_H) $(PS_H) version.h
|
$(OBJDIR)/psdots.o: psdots.c $(ES_H) $(PS_H) version.h
|
||||||
|
@ -304,7 +318,7 @@ $(OBJDIR)/ts2ps.o: ts2ps.c $(TS_H) $(PS_H) misc_fns.h version.h
|
||||||
$(CC) -c $< -o $@ $(CFLAGS)
|
$(CC) -c $< -o $@ $(CFLAGS)
|
||||||
$(OBJDIR)/tsinfo.o: tsinfo.c $(TS_H) misc_fns.h version.h
|
$(OBJDIR)/tsinfo.o: tsinfo.c $(TS_H) misc_fns.h version.h
|
||||||
$(CC) -c $< -o $@ $(CFLAGS)
|
$(CC) -c $< -o $@ $(CFLAGS)
|
||||||
$(OBJDIR)/tsreport.o: tsreport.c $(TS_H) misc_fns.h version.h
|
$(OBJDIR)/tsreport.o: tsreport.c $(TS_H) fmtx.h misc_fns.h version.h
|
||||||
$(CC) -c $< -o $@ $(CFLAGS)
|
$(CC) -c $< -o $@ $(CFLAGS)
|
||||||
$(OBJDIR)/tsserve.o: tsserve.c $(TS_H) $(PS_H) $(ES_H) misc_fns.h $(PES_H) version.h
|
$(OBJDIR)/tsserve.o: tsserve.c $(TS_H) $(PS_H) $(ES_H) misc_fns.h $(PES_H) version.h
|
||||||
$(CC) -c $< -o $@ $(CFLAGS)
|
$(CC) -c $< -o $@ $(CFLAGS)
|
||||||
|
@ -335,8 +349,8 @@ $(BINDIR):
|
||||||
mkdir $(BINDIR)
|
mkdir $(BINDIR)
|
||||||
|
|
||||||
# ------------------------------------------------------------
|
# ------------------------------------------------------------
|
||||||
.PHONY: clean
|
.PHONY: objclean
|
||||||
clean:
|
objclean:
|
||||||
-rm -f $(OBJS)
|
-rm -f $(OBJS)
|
||||||
-rm -f $(TEST_OBJS)
|
-rm -f $(TEST_OBJS)
|
||||||
-rm -f $(TEST_PROGS)
|
-rm -f $(TEST_PROGS)
|
||||||
|
@ -348,11 +362,14 @@ clean:
|
||||||
-rm -f es_test_b.ts es_test_b.264
|
-rm -f es_test_b.ts es_test_b.264
|
||||||
-rm -f *.core
|
-rm -f *.core
|
||||||
|
|
||||||
.PHONY: distclean
|
.PHONY: clean
|
||||||
distclean: clean
|
clean: objclean
|
||||||
-rm -f $(PROGS)
|
-rm -f $(PROGS)
|
||||||
-rm -f $(LIB)
|
-rm -f $(LIB)
|
||||||
-rm -f $(PROG_OBJS)
|
-rm -f $(PROG_OBJS)
|
||||||
|
|
||||||
|
.PHONY: distclean
|
||||||
|
distclean: clean
|
||||||
-rmdir $(OBJDIR)
|
-rmdir $(OBJDIR)
|
||||||
-rmdir $(LIBDIR)
|
-rmdir $(LIBDIR)
|
||||||
-rmdir $(BINDIR)
|
-rmdir $(BINDIR)
|
||||||
|
|
Ładowanie…
Reference in New Issue