[SCM] rem/master: Cosmetic clean up and delete unwanted spaces
vasudev-guest at users.alioth.debian.org
vasudev-guest at users.alioth.debian.org
Sat Jan 16 05:12:14 UTC 2016
The following commit has been merged in the master branch:
commit b5ad26411137f4014ebc67802ae68ed3eda829e8
Author: Vasudev Kamath <kamathvasudev at gmail.com>
Date: Sat Jan 16 09:54:49 2016 +0530
Cosmetic clean up and delete unwanted spaces
diff --git a/debian/patches/2001_unhide_build_rules.patch b/debian/patches/2001_unhide_build_rules.patch
index 87179c3..04f7e64 100644
--- a/debian/patches/2001_unhide_build_rules.patch
+++ b/debian/patches/2001_unhide_build_rules.patch
@@ -7,15 +7,15 @@ Last-Update: 2016-01-16
--- a/Makefile
+++ b/Makefile
-@@ -81,15 +81,13 @@ all: $(SHARED) $(STATIC)
-
-
+@@ -81,15 +81,13 @@
+
+
$(SHARED): $(OBJS)
- @echo " LD $@"
- @$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) -lre $(LIBS) -o $@
+ $(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) -lre $(LIBS) -o $@
-
-
+
+
$(STATIC): $(OBJS)
- @echo " AR $@"
- @$(AR) $(AFLAGS) $@ $^
@@ -24,44 +24,44 @@ Last-Update: 2016-01-16
- @$(RANLIB) $@
+ $(RANLIB) $@
endif
-
+
librem.pc:
-@@ -107,27 +105,25 @@ librem.pc:
+@@ -107,27 +105,25 @@
@echo 'Cflags: -I$${includedir}' >> librem.pc
-
+
$(BUILD)/%.o: src/%.c $(BUILD) Makefile $(MK) $(MODMKS)
- @echo " CC $@"
- @$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
+ $(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
-
-
+
+
$(BUILD)/%.o: src/%.S $(BUILD) Makefile $(MK) $(MODMKS)
- @echo " AS $@"
- @$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
+ $(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
-
-
+
+
$(BUILD): Makefile $(MK) $(MODMKS)
- @mkdir -p $(patsubst %,$(BUILD)/%,$(sort $(dir $(SRCS))))
- @touch $@
+ mkdir -p $(patsubst %,$(BUILD)/%,$(sort $(dir $(SRCS))))
+ touch $@
-
-
+
+
.PHONY: clean
clean:
- @rm -rf $(SHARED) $(STATIC) librem.pc test.d test.o test $(BUILD)
+ rm -rf $(SHARED) $(STATIC) librem.pc test.d test.o test $(BUILD)
-
-
+
+
install: $(SHARED) $(STATIC) librem.pc
- @mkdir -p $(DESTDIR)$(LIBDIR) $(DESTDIR)$(LIBDIR)/pkgconfig \
+ mkdir -p $(DESTDIR)$(LIBDIR) $(DESTDIR)$(LIBDIR)/pkgconfig \
$(DESTDIR)$(INCDIR)
$(INSTALL) -m 0644 $(shell find include -name "*.h") \
$(DESTDIR)$(INCDIR)
-@@ -137,17 +133,15 @@ install: $(SHARED) $(STATIC) librem.pc
-
+@@ -137,17 +133,15 @@
+
.PHONY: uninstall
uninstall:
- @rm -rf $(DESTDIR)$(INCDIR)
@@ -72,14 +72,14 @@ Last-Update: 2016-01-16
+ rm -f $(DESTDIR)$(LIBDIR)/$(SHARED)
+ rm -f $(DESTDIR)$(LIBDIR)/$(STATIC)
+ rm -f $(DESTDIR)$(LIBDIR)/pkgconfig/librem.pc
-
+
-include test.d
-
+
test.o: test.c
- @echo " CC $@"
- @$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
+ $(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
-
+
test$(BIN_SUFFIX): test.o $(SHARED) $(STATIC)
- @echo " LD $@"
- @$(LD) $(LFLAGS) $< -L. -lrem -lre $(LIBS) -o $@
--
rem packaging
More information about the pkg-multimedia-commits
mailing list