- use pkgconfig to get default CFLAGS and LDFLAGS

diff --git a/Makefile b/Makefile
index f5f3d0efeb2678dd7037280d24fc27ab0eba344b..992fbaaf8009d6b045a83eac4f0db01d9448eaef 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,11 @@
 CC := gcc
-CFLAGS :=
-LDFLAGS :=
-CPPFLAGS :=
-INCLUDES := -I/usr/include/rpm
-LIBS := -lrpm -lrpmdb -lrpmio -lrpmbuild
+CFLAGS := -Wall -Wno-unused-result $(RPMCFLAGS)
+LDFLAGS := $(RPMLDFLAGS)
+INCLUDES := `pkg-config --cflags rpm`
+LIBS := `pkg-config --libs rpm`
 
 rpm-specdump: rpm-specdump.o
        $(CC) $(LDFLAGS) $< -o $@ $(LIBS)
 
 rpm-specdump.o: rpm-specdump.c
-       $(CC) $(CFLAGS) $(INCLUDES) -W -Wall -c $< -o $@
+       $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@

diff --git a/rpm-specdump.spec b/rpm-specdump.spec
index 3e5e953bb084adeda356bfeb9dcfbd962a004110..8568116077cbcc7e54f4f08717800719daca49e0 100644 (file)
--- a/rpm-specdump.spec
+++ b/rpm-specdump.spec
@@ -26,8 +26,8 @@ ln -s %{SOURCE1} .
 %build
 %{__make} \
        CC="%{__cc}" \
-       LDFLAGS="%{rpmldflags}" \
-       CFLAGS="%{rpmcflags}"
+       RPMLDFLAGS="%{rpmldflags}" \
+       RPMCFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT