Changeset 1358 for portaudio/branches/v19-devel/Makefile.in

Timestamp:

02/22/08 15:48:22 (10 months ago)

Author:

jpgrayson

Message:

- Small fixes to build system.
-- Fix some typos in configure.in affecting Mac ASIO build and C++ binding builds.
-- Remove unused LT_RELEASE variable from configure.in and Makefile.in.
-- Split really long PA_LDFLAGS assignment.
-- Substitute make built-in $(RM) for "rm -f".
-- Use variable for lib-stamp command; this reduces output noise at make-time.
-- Use simple variable expansion when assigning OBJS.

Files:

• portaudio/branches/v19-devel/Makefile.in (modified) (5 diffs)

portaudio/branches/v19-devel/Makefile.in

@@ -31 +31 @@
 NASMOPT = @NASMOPT@
 LN_S = @LN_S@
-LT_RELEASE=@LT_RELEASE@
 LT_CURRENT=@LT_CURRENT@
 LT_REVISION=@LT_REVISION@
@@ -41 +40 @@
 PAINC = include/portaudio.h
 
-PA_LDFLAGS = $(LDFLAGS) $(SHARED_FLAGS) -rpath $(libdir) -no-undefined -export-symbols-regex "(Pa|PaMacCore|PaJack|PaAlsa)_.*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-#MAKEFILE = Makefile
+PA_LDFLAGS = $(LDFLAGS) $(SHARED_FLAGS) -rpath $(libdir) -no-undefined \
+             -export-symbols-regex "(Pa|PaMacCore|PaJack|PaAlsa)_.*" \
+             -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 COMMON_OBJS = \
@@ -114 +114 @@
         bin/debug_test1
 
-OBJS = $(COMMON_OBJS) $(OTHER_OBJS)
-
-LTOBJS:= $(OBJS:.o=.lo)
+OBJS := $(COMMON_OBJS) $(OTHER_OBJS)
+
+LTOBJS := $(OBJS:.o=.lo)
+
+SRC_DIRS = \
+        src/common \
+        src/hostapi/alsa \
+        src/hostapi/asihpi \
+        src/hostapi/asio \
+        src/hostapi/coreaudio \
+        src/hostapi/dsound \
+        src/hostapi/jack \
+        src/hostapi/oss \
+        src/hostapi/wasapi \
+        src/hostapi/wdmks \
+        src/hostapi/wmme \
+        src/os/mac_osx \
+        src/os/unix \
+        src/os/win
 
 SUBDIRS =
@@ -159 +175 @@
 clean:
         $(LIBTOOL) --mode=clean rm -f $(LTOBJS) $(ALL_TESTS) lib/$(PALIB)
-        rm -f bin-stamp lib-stamp
-        -rm -rf bin lib
+        $(RM) bin-stamp lib-stamp
+        -$(RM) -r bin lib
 
 distclean: clean
-        rm -f config.log config.status Makefile libtool portaudio-2.0.pc
+        $(RM) config.log config.status Makefile libtool portaudio-2.0.pc
 
 %.o: %.c $(MAKEFILE) $(PAINC)
@@ -183 +199 @@
 lib-stamp:
         -mkdir lib
-        -mkdir -p \
-                src/common \
-                src/hostapi/alsa \
-                src/hostapi/asihpi \
-                src/hostapi/asio \
-                src/hostapi/coreaudio \
-                src/hostapi/dsound \
-                src/hostapi/jack \
-                src/hostapi/oss \
-                src/hostapi/wasapi \
-                src/hostapi/wdmks \
-                src/hostapi/wmme \
-                src/os/mac_osx \
-                src/os/unix \
-                src/os/win
+        -mkdir -p $(SRC_DIRS)
         touch $@