Deleted all make rules related to .po files.

diff --git a/ChangeLog b/ChangeLog
index 5ef350e35984c43f4e4b882ea5ebe37624641b0a..5a20c89f21145091fca1253c363ae37f1d3ba56e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-09-03  Niels Möller  <nisse@lysator.liu.se>
 
+       * Makefile.in: Delete all uses of *.po files, use the same object
+       files for both shared and static libraries.
+       * configure.ac (dummy-dep-files): Don't create any .po.d files.
+
        * aclocal.m4 (LSH_CCPIC): Don't substitute CCPIC here, let
        configure.ac do that if needed.
 

diff --git a/Makefile.in b/Makefile.in
index 3f859b2a0ea221b2917bce99eacf63db07bc801f..43aac2de82dd6274e130df0331afee54c38a8500 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -221,10 +221,8 @@ DISTFILES = $(SOURCES) $(HEADERS) getopt.h getopt_int.h \
 
 # Rules building static libraries
 nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) $(OPT_ASM_NETTLE_SOURCES:.asm=.$(OBJEXT))
-nettle_PURE_OBJS = $(nettle_OBJS:.$(OBJEXT)=.p$(OBJEXT))
 
 hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) $(OPT_ASM_HOGWEED_SOURCES:.asm=.$(OBJEXT))
-hogweed_PURE_OBJS = $(hogweed_OBJS:.$(OBJEXT)=.p$(OBJEXT))
 
 libnettle.a: $(nettle_OBJS)
        -rm -f $@
@@ -243,8 +241,8 @@ libhogweed.a: $(hogweed_OBJS)
        && $(DEP_PROCESS)
 
 # Rules building shared libraries.
-$(LIBNETTLE_FORLINK): $(nettle_PURE_OBJS)
-       $(LIBNETTLE_LINK) $(nettle_PURE_OBJS) -o $@ $(LIBNETTLE_LIBS)
+$(LIBNETTLE_FORLINK): $(nettle_OBJS)
+       $(LIBNETTLE_LINK) $(nettle_OBJS) -o $@ $(LIBNETTLE_LIBS)
        -mkdir .lib 2>/dev/null
        (cd .lib \
           && rm -f $(LIBNETTLE_FORLINK) \
@@ -254,8 +252,8 @@ $(LIBNETTLE_FORLINK): $(nettle_PURE_OBJS)
               && $(LN_S) $(LIBNETTLE_FORLINK) $(LIBNETTLE_SONAME) ; } )
        echo nettle > libnettle.stamp
 
-$(LIBHOGWEED_FORLINK): $(hogweed_PURE_OBJS) $(LIBNETTLE_FORLINK)
-       $(LIBHOGWEED_LINK) $(hogweed_PURE_OBJS) -o $@ $(LIBHOGWEED_LIBS)
+$(LIBHOGWEED_FORLINK): $(hogweed_OBJS) $(LIBNETTLE_FORLINK)
+       $(LIBHOGWEED_LINK) $(hogweed_OBJS) -o $@ $(LIBHOGWEED_LIBS)
        -mkdir .lib 2>/dev/null
        (cd .lib \
           && rm -f $(LIBHOGWEED_FORLINK) \
@@ -265,10 +263,6 @@ $(LIBHOGWEED_FORLINK): $(hogweed_PURE_OBJS) $(LIBNETTLE_FORLINK)
               && $(LN_S) $(LIBHOGWEED_FORLINK) $(LIBHOGWEED_SONAME) ; } )
        echo hogweed > libhogweed.stamp
 
-.c.p$(OBJEXT):
-       $(COMPILE) -c $< -o $@ \
-       && $(DEP_PROCESS)
-
 # For Solaris and BSD make, we have to use an explicit rule for each
 # executable. Avoid object file targets to make it easy to run the
 # right compiler.
@@ -309,7 +303,6 @@ $(des_headers): desdata.c
          test -s $${f}T && mv -f $${f}T $$f
 
 des.$(OBJEXT): des.c des.h $(des_headers)
-des.p$(OBJEXT): des.c des.h $(des_headers)
 
 # Generate ECC files.
 # Some possible choices for 192:
@@ -367,13 +360,6 @@ ecc-384.$(OBJEXT): ecc-384.h
 ecc-521.$(OBJEXT): ecc-521.h
 ecc-25519.$(OBJEXT): ecc-25519.h
 
-ecc-192.p$(OBJEXT): ecc-192.h
-ecc-224.p$(OBJEXT): ecc-224.h
-ecc-256.p$(OBJEXT): ecc-256.h
-ecc-384.p$(OBJEXT): ecc-384.h
-ecc-521.p$(OBJEXT): ecc-521.h
-ecc-25519.p$(OBJEXT): ecc-25519.h
-
 .asm.s: $(srcdir)/asm.m4 machine.m4 config.m4
        $(M4) $(srcdir)/asm.m4 machine.m4 config.m4 $< >$@T \
        && test -s $@T && mv -f $@T $@
@@ -382,10 +368,6 @@ ecc-25519.p$(OBJEXT): ecc-25519.h
        $(COMPILE) -c $<
        @echo > $@.d
 
-.s.p$(OBJEXT):
-       $(COMPILE) -c $< -o $@
-       @echo > $@.d
-
 # Texinfo rules
 .texinfo.info:
        cd $(srcdir) && $(MAKEINFO) --output $@ `basename "$<"`
@@ -629,7 +611,7 @@ distcheck: dist
        $(rm_distcheck)
 
 clean-here:
-       -rm -f $(TARGETS) $(IMPLICIT_TARGETS) *.$(OBJEXT) *.p$(OBJEXT) *.s \
+       -rm -f $(TARGETS) $(IMPLICIT_TARGETS) *.$(OBJEXT) *.s \
                ecc-192.h ecc-224.h ecc-256.h ecc-384.h ecc-521.h ecc-25519.h \
                eccdata$(EXEEXT_FOR_BUILD) eccdata.stamp
        -rm -rf .lib libnettle.stamp libhogweed.stamp
@@ -646,5 +628,5 @@ maintainer-clean-here:
 tags-here:     
        etags -o $(srcdir)/TAGS $(srcdir)/*.c $(srcdir)/*.h
 
-DEP_FILES = $(SOURCES:.c=.$(OBJEXT).d) $(SOURCES:.c=.p$(OBJEXT).d) asm.d
+DEP_FILES = $(SOURCES:.c=.$(OBJEXT).d) asm.d
 @DEP_INCLUDE@ $(DEP_FILES)

diff --git a/configure.ac b/configure.ac
index 4591701d62e3325db1dd9945c79160ffc1453e6e..07fc994456f28ebf5950de05dee4a4dc4e2168d0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -148,7 +148,6 @@ if test x$enable_dependency_tracking = xyes ; then
   [(cd "$srcdir" && find . '(' -name '*.c' -o -name '*.cxx' ')' -print) \
  | sed 's/\.cx*$//' | (while read f; do \
       test -f "$f.o.d" || echo > "$f.o.d"; \
-      test -f "$f.po.d" || echo > "$f.po.d"; \
    done)
 ])
 fi