[xorg-commit-diffs] xc/programs/xphelloworld Imakefile, 1.1.2.1, 1.1.2.2 xphelloworld.c, 1.1.2.1, NONE xphelloworld.html, 1.1.2.1, NONE xphelloworld.man, 1.1.2.1, NONE xphelloworld.sgml, 1.1.2.1, NONE

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/xphelloworld
In directory pdx:/tmp/cvs-serv2575/xc/programs/xphelloworld

Modified Files:
      Tag: XPRINT
	Imakefile 
Removed Files:
      Tag: XPRINT
	xphelloworld.c xphelloworld.html xphelloworld.man 
	xphelloworld.sgml 
Log Message:
Fix for http://xprint.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=462 - RFE: Merge xprint.mozdev.org Xprint enhancements into Xorg XPRINT branch (http://xprint.freedesktop.org/cgi-bin/bugzilla/attachment.cgi?id=196 - fixing misc. minor problems)

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/xphelloworld/Attic/Imakefile,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- a/Imakefile	13 Apr 2004 03:16:48 -0000	1.1.2.1
+++ b/Imakefile	13 Apr 2004 05:07:47 -0000	1.1.2.2
@@ -1,20 +1,29 @@
-XCOMM $Xorg: Imakefile,v 1.3 2002/02/10 19:54:53 gisburn Exp $
-
-LOCAL_LIBRARIES = $(XLIB) -lXp -lXprintAppUtil -lXprintUtil
-SYS_LIBRARIES = MathLibrary
-DEPLIBS = $(DEPXLIB)
-
-DEFINES         = 
-           SRCS = xphelloworld.c
-           OBJS = xphelloworld.o
-
-ComplexProgramTarget(xphelloworld)
+XCOMM $Xorg: Imakefile,v 1.1 2002/02/10 19:44:00 gisburn Exp $
+#define IHaveSubdirs
+#define PassCDebugFlags
 
-#ifdef HasDocBookTools
-all:: xphelloworld.man xphelloworld.html
+XCOMM xpxmprintshell and xpawprintshell use Motif widgets
+#if HasMotif2
+XCOMM Solaris's Motif version is broken and misses XmPrintShell
+XCOMM (see http://xprint.mozdev.org/bugs/show_bug.cgi?id=1366)
+#ifndef SunArchitecture
+    XPXMHELLOWORLDDIR = xpxmhelloworld
+#endif /* SunArchitecture */
+    XPAWHELLOWORLDDIR = xpawhelloworld
+#endif /* HasMotif2 */
+    XPXTHELLOWORLDDIR = xpxthelloworld
+      XPHELLOWORLDDIR = xphelloworld
+XPSIMPLEHELLOWORLDDIR = xpsimplehelloworld
 
-ConvertDocBookToManPage(xphelloworld.sgml, xphelloworld.man)
-ConvertDocBookToHTML(xphelloworld.sgml, xphelloworld.html)
-#endif /* HasDocBookTools */
+SUBDIRS = \
+	$(XPXMHELLOWORLDDIR) \
+	$(XPAWHELLOWORLDDIR) \
+	$(XPXTHELLOWORLDDIR) \
+	$(XPHELLOWORLDDIR) \
+	$(XPSIMPLEHELLOWORLDDIR)
 
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+MakeLintLibSubdirs($(LINTSUBDIRS))
+MakeLintSubdirs($(LINTSUBDIRS),install.ln,install.ln)
 

--- xphelloworld.c DELETED ---

--- xphelloworld.html DELETED ---

--- xphelloworld.man DELETED ---

--- xphelloworld.sgml DELETED ---