diff options
| author | Josh Coalson <jcoalson@users.sourceforce.net> | 2002-10-23 22:08:13 +0000 |
|---|---|---|
| committer | Josh Coalson <jcoalson@users.sourceforce.net> | 2002-10-23 22:08:13 +0000 |
| commit | cd0e322d2ddb9d43c7e1a6ec617267f733d20c54 (patch) | |
| tree | 14dab9ee8382dc71811cf199230bbb5e27854469 /build | |
| parent | e29fb7c84c2718ff0a1f3a49b9a4ca7049114d76 (diff) | |
| download | flac-cd0e322d2ddb9d43c7e1a6ec617267f733d20c54.tar.gz | |
add notion of topdir to Makefile.lite build system
Diffstat (limited to 'build')
| -rw-r--r-- | build/config.mk | 2 | ||||
| -rw-r--r-- | build/exe.mk | 6 | ||||
| -rw-r--r-- | build/lib.mk | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/build/config.mk b/build/config.mk index 460dc1d0..5c84ba39 100644 --- a/build/config.mk +++ b/build/config.mk @@ -21,7 +21,7 @@ VERSION=\"1.0.4\" -ORDINALS_H = ../../include/FLAC/ordinals.h +ORDINALS_H = $(topdir)/include/FLAC/ordinals.h $(ORDINALS_H): $(ORDINALS_H).in sed \ diff --git a/build/exe.mk b/build/exe.mk index da514803..1b08a4c1 100644 --- a/build/exe.mk +++ b/build/exe.mk @@ -34,13 +34,13 @@ else LINKAGE = -static endif LINK = $(CC) $(LINKAGE) -BINPATH = ../../obj/bin -LIBPATH = ../../obj/lib +BINPATH = $(topdir)/obj/bin +LIBPATH = $(topdir)/obj/lib PROGRAM = $(BINPATH)/$(PROGRAM_NAME) all : release -include ../../build/config.mk +include $(topdir)/build/config.mk debug : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) diff --git a/build/lib.mk b/build/lib.mk index 62604138..9f12a466 100644 --- a/build/lib.mk +++ b/build/lib.mk @@ -28,7 +28,7 @@ CCC = g++ endif NASM = nasm LINK = ar cru -LIBPATH = ../../obj/lib +LIBPATH = $(topdir)/obj/lib ifeq ($(DARWIN_BUILD),yes) STATIC_LIB_SUFFIX = a DYNAMIC_LIB_SUFFIX = dylib @@ -46,7 +46,7 @@ endif all : release -include ../../build/config.mk +include $(topdir)/build/config.mk debug : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) |