[SCM] opencore-amr packaging branch, master, updated. upstream/0.1.2-10-g7bf1e45

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Fri Sep 18 20:48:50 UTC 2009


The following commit has been merged in the master branch:
commit 3bbf159ee0956e1015d68b23230943cf22230d9c
Author: Martin Storsjo <martin at martin.st>
Date:   Mon Jul 20 11:14:48 2009 +0300

    Compile the static libraries without -fPIC -DPIC
    
    Patch by Alexis Ballier (aballier at gentoo dot org)

diff --git a/.gitignore b/.gitignore
index 5761abc..7f18ac5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.o
+*.lo
diff --git a/amrnb/Makefile b/amrnb/Makefile
index 0bd94f1..55b068b 100644
--- a/amrnb/Makefile
+++ b/amrnb/Makefile
@@ -9,7 +9,6 @@ ifneq (, $(BUILD_AS_C))
     CXX = $(CC)
     CXXFLAGS += -x c -std=c99
 endif
-CXXFLAGS += -fPIC -DPIC
 
 ifeq (, $(PREFIX))
     PREFIX = /usr/local
@@ -49,6 +48,7 @@ COMMON_OBJS := $(COMMON_SRC:.cpp=.o)
 COMMON_OBJS := $(patsubst %,$(COMMON_SRC_DIR)/%, $(COMMON_OBJS))
 
 OBJS = wrapper.o $(DEC_OBJS) $(ENC_OBJS) $(COMMON_OBJS)
+SOBJS = $(OBJS:%.o=%.lo)
 
 #Versioning
 MAJOR = 0
@@ -67,13 +67,19 @@ SHLIB = libopencore-amrnb.$(SHLIB_EXT)
 
 all: libopencore-amrnb.a $(SHLIB)
 
-$(SHLIB): $(OBJS)
+$(SHLIB): $(SOBJS)
 ifeq ($(shell uname), Darwin)
 	$(CXX) $(SHLIB_FLAGS) -o $@ $+ $(LDFLAGS)
 else
 	$(CXX) $(SHLIB_FLAGS) -o $@ $+ -Wl,-soname,$(SONAME) $(LDFLAGS)
 endif
 
+%.lo: %.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -DPIC -c $< -o $@
+
+%.lo: %.cpp
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -DPIC -c $< -o $@
+
 libopencore-amrnb.a: $(OBJS)
 	ar rcs $@ $+
 
@@ -90,5 +96,5 @@ endif
 	install -m 644 interf_enc.h $(DESTDIR)$(PREFIX)/include/opencore-amrnb
 
 clean:
-	rm -f $(SHLIB) libopencore-amrnb.a *.o $(OBJS)
+	rm -f $(SHLIB) libopencore-amrnb.a *.o *.lo $(OBJS) $(SOBJS)
 
diff --git a/amrwb/Makefile b/amrwb/Makefile
index da543c5..534d7bb 100644
--- a/amrwb/Makefile
+++ b/amrwb/Makefile
@@ -9,7 +9,6 @@ ifneq (, $(BUILD_AS_C))
     CXX = $(CC)
     CXXFLAGS += -x c -std=c99
 endif
-CXXFLAGS += -fPIC -DPIC
 
 ifeq (, $(PREFIX))
     PREFIX = /usr/local
@@ -29,6 +28,7 @@ DEC_OBJS := $(DEC_SRC:.cpp=.o)
 DEC_OBJS := $(patsubst %,$(DEC_SRC_DIR)/%, $(DEC_OBJS))
 
 OBJS = wrapper.o $(DEC_OBJS)
+SOBJS = $(OBJS:%.o=%.lo)
 
 #Versioning
 MAJOR = 0
@@ -47,13 +47,19 @@ SHLIB = libopencore-amrwb.$(SHLIB_EXT)
 
 all: libopencore-amrwb.a $(SHLIB)
 
-$(SHLIB): $(OBJS)
+$(SHLIB): $(SOBJS)
 ifeq ($(shell uname), Darwin)
 	$(CXX) $(SHLIB_FLAGS) -o $@ $+ $(LDFLAGS)
 else
 	$(CXX) $(SHLIB_FLAGS) -o $@ $+ -Wl,-soname,$(SONAME) $(LDFLAGS)
 endif
 
+%.lo: %.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -DPIC -c $< -o $@
+
+%.lo: %.cpp
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -DPIC -c $< -o $@
+
 libopencore-amrwb.a: $(OBJS)
 	ar rcs $@ $+
 
@@ -70,5 +76,5 @@ endif
 	install -m 644 if_rom.h $(DESTDIR)$(PREFIX)/include/opencore-amrwb
 
 clean:
-	rm -f $(SHLIB) libopencore-amrwb.a *.o $(OBJS)
+	rm -f $(SHLIB) libopencore-amrwb.a *.o *.lo $(OBJS) $(SOBJS)
 

-- 
opencore-amr packaging



More information about the pkg-multimedia-commits mailing list