xt_ipp2p: move result printing code into separate functions

[thirdparty/xtables-addons.git] / Makefile.iptrules.in

diff --git a/Makefile.iptrules.in b/Makefile.iptrules.in
index 4fcdd02599ee45f65aa8b06142eeffeed852dce7..fcac8856283d4d523c47258046fdac8ba2272184 100644 (file)
--- a/Makefile.iptrules.in
+++ b/Makefile.iptrules.in
@@ -1,6 +1,8 @@
 # -*- Makefile -*-
 # MANUAL
 
+abs_top_srcdir  = @abs_top_srcdir@
+
 prefix          = @prefix@
 exec_prefix     = @exec_prefix@
 libexecdir      = @libexecdir@
@@ -8,10 +10,11 @@ xtlibdir        = @xtlibdir@
 
 CC              = @CC@
 CCLD            = ${CC}
+CFLAGS          = @CFLAGS@
+LDFLAGS         = @LDFLAGS@
 
-regular_CFLAGS  = @regular_CFLAGS@
-xtables_CFLAGS  = @xtables_CFLAGS@
-AM_CFLAGS       = ${regular_CFLAGS} ${xtables_CFLAGS}
+libxtables_CFLAGS = @libxtables_CFLAGS@
+libxtables_LIBS   = @libxtables_LIBS@
 AM_DEPFLAGS     = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
 
 AM_DEFAULT_VERBOSITY = 0
@@ -41,19 +44,19 @@ subdirs_list := $(filter %/,${obj-m})
 .PHONY: all install clean
 
 all: ${targets}
-       @for i in ${subdirs_list}; do ${MAKE} -C $$i; done;
+       @for i in ${subdirs_list}; do ${MAKE} -C $$i || exit $$?; done;
 
 install: ${targets}
-       @for i in ${subdirs_list}; do ${MAKE} -C $$i $@; done;
+       @for i in ${subdirs_list}; do ${MAKE} -C $$i $@ || exit $$?; done;
        install -dm0755 "${DESTDIR}/${xtlibdir}";
-       install -pm0755 $^ "${DESTDIR}/${xtlibdir}";
+       @for i in $^; do install -pm0755 $$i "${DESTDIR}/${xtlibdir}"; done;
 
 clean:
-       @for i in ${subdirs_list}; do ${MAKE} -C $$i $@; done;
+       @for i in ${subdirs_list}; do ${MAKE} -C $$i $@ || exit $$?; done;
        rm -f *.oo *.so;
 
 lib%.so: lib%.oo
-       ${AM_V_CCLD}${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $<;
+       ${AM_V_CCLD}${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< ${libxtables_LIBS} ${LDLIBS};
 
 %.oo: ${XA_SRCDIR}/%.c
-       ${AM_V_CC}${CC} ${AM_DEPFLAGS} ${AM_CFLAGS} -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
+       ${AM_V_CC}${CC} ${AM_DEPFLAGS} ${AM_CPPFLAGS} ${AM_CFLAGS} -DPIC -fPIC ${CPPFLAGS} ${CFLAGS} -o $@ -c $<;