diff options
| author | Josh Coalson <jcoalson@users.sourceforce.net> | 2004-12-30 03:56:08 +0000 |
|---|---|---|
| committer | Josh Coalson <jcoalson@users.sourceforce.net> | 2004-12-30 03:56:08 +0000 |
| commit | f8ecddeb7d79925d79ae091af118343d79947bd0 (patch) | |
| tree | 6b2a82c9c15f90edc256340f2be364d5f8d8224d /build | |
| parent | 2a9ae6a8bd78014bdc20b44b4a2710435b1c57a0 (diff) | |
| download | flac-f8ecddeb7d79925d79ae091af118343d79947bd0.tar.gz | |
fix typos, remove obsolete $(ORDINALS_H)
Diffstat (limited to 'build')
| -rw-r--r-- | build/config.mk | 2 | ||||
| -rw-r--r-- | build/exe.mk | 6 | ||||
| -rw-r--r-- | build/lib.mk | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/build/config.mk b/build/config.mk index 2dbf799d..1d2dc538 100644 --- a/build/config.mk +++ b/build/config.mk @@ -42,7 +42,7 @@ all default: $(DEFAULT_BUILD) VERSION=\"1.1.1\" -CONFIG_CFLAGS=-D_GNU_SOURCE -DHAVE_INTTYPES_H -DFLAC__HAS_OGG +CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DFLAC__HAS_OGG OGG_INCLUDE_DIR=$(HOME)/local/include OGG_LIB_DIR=$(HOME)/local/lib diff --git a/build/exe.mk b/build/exe.mk index beea3214..090487ff 100644 --- a/build/exe.mk +++ b/build/exe.mk @@ -50,9 +50,9 @@ LFLAGS = -L$(LIBPATH) DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) -debug : $(ORDINALS_H) $(DEBUG_PROGRAM) -valgrind: $(ORDINALS_H) $(DEBUG_PROGRAM) -release : $(ORDINALS_H) $(RELEASE_PROGRAM) +debug : $(DEBUG_PROGRAM) +valgrind: $(DEBUG_PROGRAM) +release : $(RELEASE_PROGRAM) # by default on OS X we link with static libs as much as possible diff --git a/build/lib.mk b/build/lib.mk index 54820f72..5547cd4b 100644 --- a/build/lib.mk +++ b/build/lib.mk @@ -57,7 +57,7 @@ LINKD = $(CC) -shared endif debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) -DFLAC__VALGRIND_TESTING -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) LFLAGS = -L$(LIBPATH) @@ -65,9 +65,9 @@ LFLAGS = -L$(LIBPATH) DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) $(SRCS_S:%.s=%.debug.o) RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) $(SRCS_S:%.s=%.release.o) -debug : $(ORDINALS_H) $(DEBUG_STATIC_LIB) $(DEBUG_DYNAMIC_LIB) -valgrind: $(ORDINALS_H) $(DEBUG_STATIC_LIB) $(DEBUG_DYNAMIC_LIB) -release : $(ORDINALS_H) $(RELEASE_STATIC_LIB) $(RELEASE_DYNAMIC_LIB) +debug : $(DEBUG_STATIC_LIB) $(DEBUG_DYNAMIC_LIB) +valgrind: $(DEBUG_STATIC_LIB) $(DEBUG_DYNAMIC_LIB) +release : $(RELEASE_STATIC_LIB) $(RELEASE_DYNAMIC_LIB) $(DEBUG_STATIC_LIB): $(DEBUG_OBJS) $(LINK) $@ $(DEBUG_OBJS) && ranlib $@ @@ -115,7 +115,7 @@ endif .PHONY : clean clean : - -rm -f $(DEBUG_OBJS) $(RELEASE_OBJS) $(OBJPATH)/*/lib/$(STATIC_LIB_NAME) $(OBJPATH)/*/lib/$(DYNAMIC_LIB_NAME) $(ORDINALS_H) + -rm -f $(DEBUG_OBJS) $(RELEASE_OBJS) $(OBJPATH)/*/lib/$(STATIC_LIB_NAME) $(OBJPATH)/*/lib/$(DYNAMIC_LIB_NAME) .PHONY : depend depend: |