Reverse messed up commit

git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2222 9d0c8265-081b-0410-96cb-a4ca84ce46f8

3 files changed, 20 insertions, 16 deletions

diff --git a/other/pamx/Makefile b/other/pamx/Makefile
index 4e06e0fd..b41cadf8 100644
--- a/other/pamx/Makefile
+++ b/other/pamx/Makefile
@@ -25,20 +25,23 @@ else
 endif
 
 ifeq ($(HAVE_X11LIB),Y)
-  PORTBINARIES += pamx
+  BINARIES += pamx
 
-  EXTRA_OBJECTS = \
+  PAMX_OBJECTS = \
+	  pamx.o \
 	  image.o \
 	  send.o \
 	  window.o \
 
-endif
-
-BINARIES = $(PORTBINARIES)
+  MERGE_OBJECTS = \
+	  pamx.o2 \
+	  image.o \
+	  send.o \
+	  window.o \
 
-OBJECTS = $(BINARIES:%=%.o) $(EXTRA_OBJECTS)
+endif
 
-MERGE_OBJECTS = $(BINARIES:%=%.o2) $(EXTRA_OBJECTS)
+OBJECTS = $(PAMX_OBJECTS)
 
 MERGEBINARIES = $(BINARIES)
 
@@ -52,6 +55,7 @@ else
   X11_LIBOPTS = $(shell pkg-config x11 --libs)
 endif
 
-pamx: image.o send.o window.o
-pamx: ADDL_OBJECTS = image.o send.o window.o
-pamx: LDFLAGS_TARGET = $(X11_LIBOPTS)
+pamx: $(PAMX_OBJECTS) $(NETPBMLIB) $(LIBOPT)
+	$(LD) -o $@ $(PAMX_OBJECTS) \
+	  $(shell $(LIBOPT) $(NETPBMLIB) $(X11_LIBOPTS)) \
+	  $(LDFLAGS) $(LDLIBS) $(MATHLIB) $(RPATH) $(LADD)
diff --git a/other/pamx/send.c b/other/pamx/send.c
index fd50d5e9..597b76c7 100644
--- a/other/pamx/send.c
+++ b/other/pamx/send.c
@@ -78,8 +78,8 @@ ximageToPixmap(Display *    const disp,
 
 
 
-/* find the best pixmap depth the server can do for a particular visual and
- * return that depth.
+/* find the best pixmap depth supported by the server for a particular
+ * visual and return that depth.
  *
  * this is complicated by R3's lack of XListPixmapFormats so we fake it
  * by looking at the structure ourselves.
diff --git a/other/pamx/window.c b/other/pamx/window.c
index 3cded1b3..ec2a77fe 100644
--- a/other/pamx/window.c
+++ b/other/pamx/window.c
@@ -193,7 +193,7 @@ determineRepaintStrategy(viewer  *    const viewerP,
                         
     /* Decide how we're going to handle repaints.  We have three modes:
        use backing-store, use background pixmap, and use exposures.
-       If the server allows backing-store, we enable it and use it.
+       If the server supports backing-store, we enable it and use it.
        This really helps servers which are memory constrained.  If the
        server does not have backing-store, we try to send the image to
        a pixmap and use that as backing-store.  If that fails, we use
@@ -652,9 +652,9 @@ bestVisual(Display *      const disp,
     Visual * visualP;
     Visual * default_visualP;
 
-    /* Figure out the best depth the server allows.  note that some servers
-       (such as the HP 11.3 server) actually say they allow some depths but
-       have no visuals that allow that depth.  Seems silly to me ...
+    /* Figure out the best depth the server supports.  note that some servers
+       (such as the HP 11.3 server) actually say they support some depths but
+       have no visuals that support that depth.  Seems silly to me ...
     */
 
     depth = 0;