Link to plain libXaw instead of libXaw3d

iraf-community · Jan 12, 2024 · a2d183e · a2d183e
1 parent 0e80d41
commit a2d183e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
         if: startsWith(matrix.os, 'ubuntu')
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential libncurses-dev libxaw7-dev libxmu-dev libxpm-dev xaw3dg-dev tcl-dev iraf-dev xauth xvfb
+          sudo apt-get install -y build-essential libncurses-dev libxaw7-dev libxmu-dev libxpm-dev tcl-dev iraf-dev xauth xvfb
 
       - name: Setup XQuartz on macOS
         if: runner.os == 'macos'

diff --git a/README.md b/README.md
@@ -62,7 +62,7 @@ IRAF installation with its development tools is required.
 On Debian and its derivatives (Ubuntu, Mint, Devuan, Raspbian etc.):
 
     $ sudo apt install gcc make bison flex libncurses-dev tcl-dev
-    $ sudo apt install libxaw7-dev libxmu-dev xaw3dg-dev libxpm-dev
+    $ sudo apt install libxaw7-dev libxmu-dev libxpm-dev
     $ sudo apt install iraf-dev
 
 On MacOS X, you need to have the XCode tools installed. If you

diff --git a/obm/listres/Makefile b/obm/listres/Makefile
@@ -12,7 +12,7 @@ all: listres
 listres: $(OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(OBJS) \
 	    -L.. -lobm \
-	    -lXpm -ltcl -lXaw3d -lXmu -lXt -lXext -lX11 -lm
+	    -lXpm -ltcl -lXaw -lXmu -lXt -lXext -lX11 -lm
 
 clean:
 	rm -f listres $(OBJS)
diff --git a/obmsh/Makefile b/obmsh/Makefile
@@ -12,7 +12,7 @@ endif
 obmsh: $(OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(OBJS) \
 	    -L../obm -lobm \
-	    -lXpm -ltcl -lXaw3d -lXmu -lXt -lXext -lX11 -lncurses -lm
+	    -lXpm -ltcl -lXaw -lXmu -lXt -lXext -lX11 -lncurses -lm
 
 clean:
 	rm -f obmsh $(OBJS)
diff --git a/xgterm/Makefile b/xgterm/Makefile
@@ -13,7 +13,7 @@ endif
 xgterm: $(OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(OBJS) \
 	    -L../obm -lobm \
-	    -lXpm -ltcl -lXaw3d -lXmu -lXt -lXext -lX11 -lncurses -lm
+	    -lXpm -ltcl -lXaw -lXmu -lXt -lXext -lX11 -lncurses -lm
 
 clean:
 	rm -f xgterm $(OBJS)
diff --git a/ximtool/Makefile b/ximtool/Makefile
@@ -31,7 +31,7 @@ ximtool.html.h: ximtool.html
 ximtool: $(OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(OBJS) \
 	    -L../obm -lobm \
-	    -lXpm -ltcl -lXaw3d -lXmu -lXt -lXext -lX11 -lncurses -lm
+	    -lXpm -ltcl -lXaw -lXmu -lXt -lXext -lX11 -lncurses -lm
 
 clients:
 	cd clients && mkpkg || true

diff --git a/xtapemon/Makefile b/xtapemon/Makefile
@@ -9,7 +9,7 @@ endif
 all: xtapemon
 
 xtapemon: $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) -lXaw3d -lXmu -lXt -lX11 -lm
+	$(CC) $(LDFLAGS) -o $@ $(OBJS) -lXaw -lXmu -lXt -lX11 -lm
 
 clean:
 	rm -f xtapemon $(OBJS)