Add support for pie

13 files changed, 156 insertions, 24 deletions

diff --git a/Makefile.in b/Makefile.in
index 43e28c7..87475a5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -220,6 +220,7 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CFLAGS_PIE = @CFLAGS_PIE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -247,6 +248,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LDFLAGS_PIE = @LDFLAGS_PIE@
 LFS_FLAG = @LFS_FLAG@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
diff --git a/configure b/configure
index 9427b4c..72eb7eb 100755
--- a/configure
+++ b/configure
@@ -673,6 +673,8 @@ V6_FLAG
 OPENSSL_LIBS
 HTTPS_SUPPORT
 AM_CFLAGS
+LDFLAGS_PIE
+CFLAGS_PIE
 DEFAULT_LDFLAGS
 DEFAULT_CFLAGS
 VERSION_INFO
@@ -13734,14 +13736,14 @@ else
   :
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,relro -Wl,-z,now" >&5
-$as_echo_n "checking whether the linker accepts -Wl,-z,relro -Wl,-z,now... " >&6; }
-if ${ax_cv_check_ldflags___Wl__z_relro__Wl__z_now+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,relro,-z,now" >&5
+$as_echo_n "checking whether the linker accepts -Wl,-z,relro,-z,now... " >&6; }
+if ${ax_cv_check_ldflags___Wl__z_relro__z_now+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   ax_check_save_flags=$LDFLAGS
-  LDFLAGS="$LDFLAGS  -Wl,-z,relro -Wl,-z,now"
+  LDFLAGS="$LDFLAGS  -Wl,-z,relro,-z,now"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -13754,18 +13756,18 @@ main ()
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_check_ldflags___Wl__z_relro__Wl__z_now=yes
+  ax_cv_check_ldflags___Wl__z_relro__z_now=yes
 else
-  ax_cv_check_ldflags___Wl__z_relro__Wl__z_now=no
+  ax_cv_check_ldflags___Wl__z_relro__z_now=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   LDFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl__z_relro__Wl__z_now" >&5
-$as_echo "$ax_cv_check_ldflags___Wl__z_relro__Wl__z_now" >&6; }
-if test "x$ax_cv_check_ldflags___Wl__z_relro__Wl__z_now" = xyes; then :
-  DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,-z,relro -Wl,-z,now"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl__z_relro__z_now" >&5
+$as_echo "$ax_cv_check_ldflags___Wl__z_relro__z_now" >&6; }
+if test "x$ax_cv_check_ldflags___Wl__z_relro__z_now" = xyes; then :
+  DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,-z,relro,-z,now"
 else
   :
 fi
@@ -13807,6 +13809,83 @@ else
 fi
 
 
+### PIE
+CFLAGS_PIE=""
+LDFLAGS_PIE=""
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fpie -pie" >&5
+$as_echo_n "checking whether C compiler accepts -fpie -pie... " >&6; }
+if ${ax_cv_check_cflags___fpie__pie+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -fpie -pie"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags___fpie__pie=yes
+else
+  ax_cv_check_cflags___fpie__pie=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fpie__pie" >&5
+$as_echo "$ax_cv_check_cflags___fpie__pie" >&6; }
+if test "x$ax_cv_check_cflags___fpie__pie" = xyes; then :
+  CFLAGS_PIE="-fpie -pie"
+else
+  :
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -pie" >&5
+$as_echo_n "checking whether the linker accepts -pie... " >&6; }
+if ${ax_cv_check_ldflags___pie+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS  -pie"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_ldflags___pie=yes
+else
+  ax_cv_check_ldflags___pie=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___pie" >&5
+$as_echo "$ax_cv_check_ldflags___pie" >&6; }
+if test "x$ax_cv_check_ldflags___pie" = xyes; then :
+  LDFLAGS_PIE="-pie"
+else
+  :
+fi
+
+
+
+
 ## Export all symbols for backtraces
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -rdynamic" >&5
 $as_echo_n "checking whether C compiler accepts -rdynamic... " >&6; }
diff --git a/configure.ac b/configure.ac
index 830c409..c92407d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,9 +77,17 @@ AX_CHECK_COMPILE_FLAG([-fstrict-aliasing -Wstrict-aliasing], [DEFAULT_CFLAGS="$D
 AX_CHECK_COMPILE_FLAG([-fstack-protector], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-protector"])
 AX_CHECK_LINK_FLAG([-Wl,--discard-all], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,--discard-all"])
 AX_CHECK_LINK_FLAG([-Wl,--no-undefined], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,--no-undefined"])
-AX_CHECK_LINK_FLAG([-Wl,-z,relro -Wl,-z,now], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,-z,relro -Wl,-z,now"])
+AX_CHECK_LINK_FLAG([-Wl,-z,relro,-z,now], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,-z,relro,-z,now"])
 AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,-z,noexecstack"])
 
+### PIE
+CFLAGS_PIE=""
+LDFLAGS_PIE=""
+AX_CHECK_COMPILE_FLAG([-fpie -pie], [CFLAGS_PIE="-fpie -pie"])
+AX_CHECK_LINK_FLAG([-pie], [LDFLAGS_PIE="-pie"])
+AC_SUBST([CFLAGS_PIE])
+AC_SUBST([LDFLAGS_PIE])
+
 ## Export all symbols for backtraces
 AX_CHECK_COMPILE_FLAG([-rdynamic], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -rdynamic"])
 
diff --git a/html/Makefile.in b/html/Makefile.in
index 60b3d68..5a0dfce 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -175,6 +175,7 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CFLAGS_PIE = @CFLAGS_PIE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -202,6 +203,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LDFLAGS_PIE = @LDFLAGS_PIE@
 LFS_FLAG = @LFS_FLAG@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
diff --git a/lang/Makefile.in b/lang/Makefile.in
index 824ccca..8c99be7 100644
--- a/lang/Makefile.in
+++ b/lang/Makefile.in
@@ -165,6 +165,7 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CFLAGS_PIE = @CFLAGS_PIE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -192,6 +193,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LDFLAGS_PIE = @LDFLAGS_PIE@
 LFS_FLAG = @LFS_FLAG@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
diff --git a/libtest/Makefile.in b/libtest/Makefile.in
index 3e57553..eb41c09 100644
--- a/libtest/Makefile.in
+++ b/libtest/Makefile.in
@@ -309,6 +309,7 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CFLAGS_PIE = @CFLAGS_PIE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -336,6 +337,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LDFLAGS_PIE = @LDFLAGS_PIE@
 LFS_FLAG = @LFS_FLAG@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 0b00bd8..1dc0446 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -135,6 +135,7 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CFLAGS_PIE = @CFLAGS_PIE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -162,6 +163,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LDFLAGS_PIE = @LDFLAGS_PIE@
 LFS_FLAG = @LFS_FLAG@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
diff --git a/man/Makefile.in b/man/Makefile.in
index 175a428..1badcf2 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -166,6 +166,7 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CFLAGS_PIE = @CFLAGS_PIE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -193,6 +194,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LDFLAGS_PIE = @LDFLAGS_PIE@
 LFS_FLAG = @LFS_FLAG@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
diff --git a/man/httrack.1 b/man/httrack.1
index 1395b56..da940e2 100644
--- a/man/httrack.1
+++ b/man/httrack.1
@@ -1,7 +1,7 @@
 .\" Process this file with
 .\" groff -man -Tascii httrack.1
 .\"
-.TH httrack 1 "12 January 2023" "httrack website copier"
+.TH httrack 1 "13 January 2023" "httrack website copier"
 .SH NAME
 httrack \- offline browser : copy websites to a local directory
 .SH SYNOPSIS
diff --git a/src/Makefile.am b/src/Makefile.am
index 6937457..e6f2613 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,8 +32,14 @@ bin_PROGRAMS = proxytrack httrack htsserver
 httrack_LDADD = $(THREADS_LIBS) libhttrack.la
 htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la
 proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS)
-proxytrack_CFLAGS = $(AM_CFLAGS) -DNO_MALLOCT -DZLIB_CONST -DHTS_INTHASH_USES_MD5
-htsserver_CFLAGS = $(AM_CFLAGS) -DZLIB_CONST -DHTS_INTHASH_USES_MD5
+
+httrack_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PIE)
+proxytrack_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PIE) -DNO_MALLOCT -DZLIB_CONST -DHTS_INTHASH_USES_MD5
+htsserver_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PIE) -DZLIB_CONST -DHTS_INTHASH_USES_MD5
+
+httrack_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PIE)
+proxytrack_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PIE)
+htsserver_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PIE)
 
 lib_LTLIBRARIES = libhttrack.la libhtsjava.la
 
diff --git a/src/Makefile.in b/src/Makefile.in
index bddcc2d..548f5ff 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -182,10 +182,13 @@ htsserver_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	libhttrack.la
 htsserver_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(htsserver_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+	$(CFLAGS) $(htsserver_LDFLAGS) $(LDFLAGS) -o $@
 httrack_SOURCES = httrack.c
-httrack_OBJECTS = httrack.$(OBJEXT)
+httrack_OBJECTS = httrack-httrack.$(OBJEXT)
 httrack_DEPENDENCIES = $(am__DEPENDENCIES_1) libhttrack.la
+httrack_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(httrack_CFLAGS) \
+	$(CFLAGS) $(httrack_LDFLAGS) $(LDFLAGS) -o $@
 am_proxytrack_OBJECTS = proxy/proxytrack-main.$(OBJEXT) \
 	proxy/proxytrack-proxytrack.$(OBJEXT) \
 	proxy/proxytrack-store.$(OBJEXT) \
@@ -198,7 +201,7 @@ proxytrack_OBJECTS = $(am_proxytrack_OBJECTS)
 proxytrack_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 proxytrack_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(proxytrack_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+	$(CFLAGS) $(proxytrack_LDFLAGS) $(LDFLAGS) -o $@
 SCRIPTS = $(whttrackrun_SCRIPTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -217,7 +220,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
 am__depfiles_remade = ./$(DEPDIR)/htsjava.Plo \
 	./$(DEPDIR)/htsserver-htsserver.Po \
-	./$(DEPDIR)/htsserver-htsweb.Po ./$(DEPDIR)/httrack.Po \
+	./$(DEPDIR)/htsserver-htsweb.Po ./$(DEPDIR)/httrack-httrack.Po \
 	./$(DEPDIR)/libhttrack_la-htsalias.Plo \
 	./$(DEPDIR)/libhttrack_la-htsback.Plo \
 	./$(DEPDIR)/libhttrack_la-htsbauth.Plo \
@@ -322,6 +325,7 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CFLAGS_PIE = @CFLAGS_PIE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -349,6 +353,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LDFLAGS_PIE = @LDFLAGS_PIE@
 LFS_FLAG = @LFS_FLAG@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -475,8 +480,12 @@ AM_CPPFLAGS = \
 httrack_LDADD = $(THREADS_LIBS) libhttrack.la
 htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la
 proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS)
-proxytrack_CFLAGS = $(AM_CFLAGS) -DNO_MALLOCT -DZLIB_CONST -DHTS_INTHASH_USES_MD5
-htsserver_CFLAGS = $(AM_CFLAGS) -DZLIB_CONST -DHTS_INTHASH_USES_MD5
+httrack_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PIE)
+proxytrack_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PIE) -DNO_MALLOCT -DZLIB_CONST -DHTS_INTHASH_USES_MD5
+htsserver_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PIE) -DZLIB_CONST -DHTS_INTHASH_USES_MD5
+httrack_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PIE)
+proxytrack_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PIE)
+htsserver_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PIE)
 lib_LTLIBRARIES = libhttrack.la libhtsjava.la
 htsserver_SOURCES = htsserver.c htsserver.h htsweb.c htsweb.h
 proxytrack_SOURCES = proxy/main.c \
@@ -694,7 +703,7 @@ htsserver$(EXEEXT): $(htsserver_OBJECTS) $(htsserver_DEPENDENCIES) $(EXTRA_htsse
 
 httrack$(EXEEXT): $(httrack_OBJECTS) $(httrack_DEPENDENCIES) $(EXTRA_httrack_DEPENDENCIES) 
 	@rm -f httrack$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(httrack_OBJECTS) $(httrack_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(httrack_LINK) $(httrack_OBJECTS) $(httrack_LDADD) $(LIBS)
 proxy/$(am__dirstamp):
 	@$(MKDIR_P) proxy
 	@: > proxy/$(am__dirstamp)
@@ -771,7 +780,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htsjava.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htsserver-htsserver.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htsserver-htsweb.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httrack.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httrack-httrack.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsalias.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsback.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsbauth.Plo@am__quote@ # am--include-marker
@@ -1105,6 +1114,20 @@ htsserver-htsweb.obj: htsweb.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(htsserver_CFLAGS) $(CFLAGS) -c -o htsserver-htsweb.obj `if test -f 'htsweb.c'; then $(CYGPATH_W) 'htsweb.c'; else $(CYGPATH_W) '$(srcdir)/htsweb.c'; fi`
 
+httrack-httrack.o: httrack.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(httrack_CFLAGS) $(CFLAGS) -MT httrack-httrack.o -MD -MP -MF $(DEPDIR)/httrack-httrack.Tpo -c -o httrack-httrack.o `test -f 'httrack.c' || echo '$(srcdir)/'`httrack.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/httrack-httrack.Tpo $(DEPDIR)/httrack-httrack.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='httrack.c' object='httrack-httrack.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(httrack_CFLAGS) $(CFLAGS) -c -o httrack-httrack.o `test -f 'httrack.c' || echo '$(srcdir)/'`httrack.c
+
+httrack-httrack.obj: httrack.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(httrack_CFLAGS) $(CFLAGS) -MT httrack-httrack.obj -MD -MP -MF $(DEPDIR)/httrack-httrack.Tpo -c -o httrack-httrack.obj `if test -f 'httrack.c'; then $(CYGPATH_W) 'httrack.c'; else $(CYGPATH_W) '$(srcdir)/httrack.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/httrack-httrack.Tpo $(DEPDIR)/httrack-httrack.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='httrack.c' object='httrack-httrack.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(httrack_CFLAGS) $(CFLAGS) -c -o httrack-httrack.obj `if test -f 'httrack.c'; then $(CYGPATH_W) 'httrack.c'; else $(CYGPATH_W) '$(srcdir)/httrack.c'; fi`
+
 proxy/proxytrack-main.o: proxy/main.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxy/proxytrack-main.o -MD -MP -MF proxy/$(DEPDIR)/proxytrack-main.Tpo -c -o proxy/proxytrack-main.o `test -f 'proxy/main.c' || echo '$(srcdir)/'`proxy/main.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) proxy/$(DEPDIR)/proxytrack-main.Tpo proxy/$(DEPDIR)/proxytrack-main.Po
@@ -1413,7 +1436,7 @@ distclean: distclean-am
 		-rm -f ./$(DEPDIR)/htsjava.Plo
 	-rm -f ./$(DEPDIR)/htsserver-htsserver.Po
 	-rm -f ./$(DEPDIR)/htsserver-htsweb.Po
-	-rm -f ./$(DEPDIR)/httrack.Po
+	-rm -f ./$(DEPDIR)/httrack-httrack.Po
 	-rm -f ./$(DEPDIR)/libhttrack_la-htsalias.Plo
 	-rm -f ./$(DEPDIR)/libhttrack_la-htsback.Plo
 	-rm -f ./$(DEPDIR)/libhttrack_la-htsbauth.Plo
@@ -1505,7 +1528,7 @@ maintainer-clean: maintainer-clean-am
 		-rm -f ./$(DEPDIR)/htsjava.Plo
 	-rm -f ./$(DEPDIR)/htsserver-htsserver.Po
 	-rm -f ./$(DEPDIR)/htsserver-htsweb.Po
-	-rm -f ./$(DEPDIR)/httrack.Po
+	-rm -f ./$(DEPDIR)/httrack-httrack.Po
 	-rm -f ./$(DEPDIR)/libhttrack_la-htsalias.Plo
 	-rm -f ./$(DEPDIR)/libhttrack_la-htsback.Plo
 	-rm -f ./$(DEPDIR)/libhttrack_la-htsbauth.Plo
diff --git a/templates/Makefile.in b/templates/Makefile.in
index c3a0dfa..7deb8a7 100644
--- a/templates/Makefile.in
+++ b/templates/Makefile.in
@@ -165,6 +165,7 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CFLAGS_PIE = @CFLAGS_PIE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -192,6 +193,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LDFLAGS_PIE = @LDFLAGS_PIE@
 LFS_FLAG = @LFS_FLAG@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index be4075f..204ac21 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -337,6 +337,7 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CFLAGS_PIE = @CFLAGS_PIE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -364,6 +365,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LDFLAGS_PIE = @LDFLAGS_PIE@
 LFS_FLAG = @LFS_FLAG@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@