building XFree86 from cvs

Guy Harrison swamp-dog@ntlworld.com
Mon Aug 19 02:41:00 GMT 2002


On Mon, 19 Aug 2002 01:21:41 -0400, "Harold Hunt" <huntharo@msu.edu>
wrote:

>Michael,
>
>Oh, you are only missing about 30 pages that describe exactly how to build
>XFree86 for Cygwin:
>http://xfree86.cygwin.com/docs/cg/cygwin-xfree-cg.html
>
>Start with those.  It is unlikely that you will have problems.

There's two of us making the same mistake then. I mentioned it here in
the "Cross Compiling" thread (Sat 17th), thinking that perhaps the
native build was connected - something concerning PROGRAMS. I'd much
appreciate a hint!

I looked at ProgramTargetName(,) and HostProgramTargetName() in
cygwin.rules and didn't see anything obvious there. Concat(,) turned out
to not be what I hoped (ie conditional) so back to my two original
possibilities: (a) done something really silly (b) not my fault.

I tweaked the makefiles to see if there'd be any subsequent issues.
There weren't. I kept the original generated ones. Summary...

--- ./config/util/Makefile.ORIGINAL	2002-08-17 03:43:06.000000000
+0100
+++ ./config/util/Makefile	2002-08-17 04:21:06.000000000 +0100
@@ -896,11 +896,12 @@
 
 GCCMDEP_PROG = gccmakedep
 
-LNDIR_PROG = lndir.exe
+LNDIR_STUB = lndir
+LNDIR_PROG = $(LNDIR_STUB).exe
 
 RMAN_PROG = rman.exe
 
-PROGRAMS = $(RMAN_PROG) $(LNDIR_PROG) makestrs.exe 	   revpath.exe
$(EXPORTLISTGEN) $(CMKDIRHIER)
+PROGRAMS = rman lndir makestrs revpath $(EXPORTLISTGEN) $(CMKDIRHIER)
 
 DEPLIBS =
 
@@ -953,14 +954,14 @@
 
 all:: $(LNDIR_PROG)
 
- OBJS2 = $(LNDIR_PROG).o
- SRCS2 = $(LNDIR_PROG).c
+ OBJS2 = lndir.o
+ SRCS2 = lndir.c
 
-$(LNDIR_PROG).exe: $(OBJS2) $(DEPLIBS2)
+$(LNDIR_STUB).exe: $(OBJS2) $(DEPLIBS2)
 	$(RM) $@
 	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJS2) $(LOCAL_LIBRARIES)
$(LDLIBS)  $(EXTRA_LOAD_FLAGS)
 
-install:: $(LNDIR_PROG).exe
+install:: $(LNDIR_STUB).exe
 	@if [ -d $(DESTDIR)$(BINDIR) ]; then \
 	set +x; \
 	else \
@@ -969,16 +970,16 @@
 	fi; \
 	(set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); \
 	fi
-	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS)  $(LNDIR_PROG).exe
$(DESTDIR)$(BINDIR)/$(LNDIR_PROG).exe
+	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS)  $(LNDIR_STUB).exe
$(DESTDIR)$(BINDIR)/$(LNDIR_STUB).exe
 
-all:: $(LNDIR_PROG).$(MANSUFFIX).html
+all:: $(LNDIR_STUB).$(MANSUFFIX).html
 
-$(LNDIR_PROG).$(MANSUFFIX).html: $(LNDIR_PROG).$(MANNEWSUFFIX)
$(RMAN).exe
-	$(RM) $(LNDIR_PROG).$(MANSUFFIX).html
$(LNDIR_PROG).$(MANSUFFIX)-html
-	$(RMAN) $(RMANOPTIONS) < $(LNDIR_PROG).$(MANNEWSUFFIX) \
-	> $(LNDIR_PROG).$(MANSUFFIX)-html && $(MV)
$(LNDIR_PROG).$(MANSUFFIX)-html $@
+$(LNDIR_STUB).$(MANSUFFIX).html: $(LNDIR_STUB).$(MANNEWSUFFIX)
$(RMAN).exe
+	$(RM) $(LNDIR_STUB).$(MANSUFFIX).html
$(LNDIR_STUB).$(MANSUFFIX)-html
+	$(RMAN) $(RMANOPTIONS) < $(LNDIR_STUB).$(MANNEWSUFFIX) \
+	> $(LNDIR_STUB).$(MANSUFFIX)-html && $(MV)
$(LNDIR_STUB).$(MANSUFFIX)-html $@
 
-install.man:: $(LNDIR_PROG).$(MANSUFFIX).html
+install.man:: $(LNDIR_STUB).$(MANSUFFIX).html
 	@if [ -d $(DESTDIR)$(DOCHTMLDIR) ]; then \
 	set +x; \
 	else \
@@ -989,21 +990,21 @@
 	fi
 	@(SUF=`expr $(MANSUFFIX) \: '\(.\)'`; \
 	set -x; \
-	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS)
$(LNDIR_PROG).$(MANSUFFIX).html
$(DESTDIR)$(DOCHTMLDIR)/$(LNDIR_PROG).$$SUF.html)
+	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS)
$(LNDIR_STUB).$(MANSUFFIX).html
$(DESTDIR)$(DOCHTMLDIR)/$(LNDIR_STUB).$$SUF.html)
 
 cleandir::
-	$(RM) $(LNDIR_PROG).$(MANSUFFIX).html
$(LNDIR_PROG).$(MANSUFFIX)-html
+	$(RM) $(LNDIR_STUB).$(MANSUFFIX).html
$(LNDIR_STUB).$(MANSUFFIX)-html
 
-all:: $(LNDIR_PROG).$(MANNEWSUFFIX)
+all:: $(LNDIR_STUB).$(MANNEWSUFFIX)
 
-$(LNDIR_PROG).$(MANNEWSUFFIX)::  $(LNDIR_PROG).$(MANSRCSUFFIX)
+$(LNDIR_STUB).$(MANNEWSUFFIX)::  $(LNDIR_STUB).$(MANSRCSUFFIX)
 	$(RM) $@
-	 $(RAWCPP)  $(MANDEFS) $(EXTRAMANDEFS)
<$(LNDIR_PROG).$(MANSRCSUFFIX) | sed -e '/^#  *[0-9][0-9]*  *.*$$/d' -e
'/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/' >$@
+	 $(RAWCPP)  $(MANDEFS) $(EXTRAMANDEFS)
<$(LNDIR_STUB).$(MANSRCSUFFIX) | sed -e '/^#  *[0-9][0-9]*  *.*$$/d' -e
'/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/' >$@
 
 cleandir::
-	$(RM) $(LNDIR_PROG).$(MANNEWSUFFIX)
+	$(RM) $(LNDIR_STUB).$(MANNEWSUFFIX)
 
-install.man:: $(LNDIR_PROG).$(MANNEWSUFFIX)
+install.man:: $(LNDIR_STUB).$(MANNEWSUFFIX)
 	@if [ -d $(DESTDIR)$(MANDIR) ]; then \
 	set +x; \
 	else \
@@ -1012,7 +1013,7 @@
 	fi; \
 	(set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); \
 	fi
-	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS)
$(LNDIR_PROG).$(MANNEWSUFFIX)
$(DESTDIR)$(MANDIR)/$(LNDIR_PROG).$(MANSUFFIX)
+	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS)
$(LNDIR_STUB).$(MANNEWSUFFIX)
$(DESTDIR)$(MANDIR)/$(LNDIR_STUB).$(MANSUFFIX)
 
 all:: makestrs.exe
 
--- ./programs/bitmap/Makefile.ORIGINAL	2002-08-17 04:50:36.000000000
+0100
+++ ./programs/bitmap/Makefile	2002-08-17 04:53:13.000000000 +0100
@@ -918,7 +918,7 @@
           OBJS2 = bmtoa.o
           SRCS3 = atobm.c
           OBJS3 = atobm.o
-       PROGRAMS = bitmap.exe bmtoa.exe atobm.exe
+       PROGRAMS = bitmap bmtoa atobm
 
  OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) \
  $(OBJS6) $(OBJS7) $(OBJS8) $(OBJS9) $(OBJS10)
--- ./programs/proxymngr/Makefile.ORIGINAL	2002-08-17
04:54:29.000000000 +0100
+++ ./programs/proxymngr/Makefile	2002-08-17 04:54:58.000000000
+0100
@@ -905,7 +905,7 @@
 
            OBJS1 = main.o pmdb.o config.o
 
-        PROGRAMS = proxymngr.exe
+        PROGRAMS = proxymngr
 
         LBXPROXY = $(BINDIR)/lbxproxy
 
--- ./programs/xclipboard/Makefile.ORIGINAL	2002-08-17
04:57:05.000000000 +0100
+++ ./programs/xclipboard/Makefile	2002-08-17 04:57:37.000000000
+0100
@@ -898,7 +898,7 @@
           OBJS1 = xclipboard.o
           SRCS2 = xcutsel.c
           OBJS2 = xcutsel.o
-       PROGRAMS = xclipboard.exe xcutsel.exe
+       PROGRAMS = xclipboard xcutsel
         DEPLIBS =  $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB)
$(DEPXPMLIB) $(DEPXLIB)
 LOCAL_LIBRARIES =  $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB)
$(XLIB)
         DEFINES =
--- ./programs/xdm/Makefile.ORIGINAL	2002-08-17 04:59:34.000000000
+0100
+++ ./programs/xdm/Makefile	2002-08-17 05:02:21.000000000 +0100
@@ -932,9 +932,9 @@
           SRCS4 = sessreg.c
           OBJS4 = sessreg.o
 
-        CHOOSER = chooser.exe
+        CHOOSER = chooser
 
-       PROGRAMS = xdm.exe xdmshell.exe sessreg.exe $(CHOOSER)
$(XDM_SHADOW)
+       PROGRAMS = xdm xdmshell sessreg $(CHOOSER) $(XDM_SHADOW)
 
  OSMAJORVERSION = 1
  OSMINORVERSION = 3
--- ./programs/xfindproxy/Makefile.ORIGINAL	2002-08-17
05:05:01.000000000 +0100
+++ ./programs/xfindproxy/Makefile	2002-08-17 05:05:27.000000000
+0100
@@ -901,7 +901,7 @@
 
            OBJS1 = xfindproxy.o
 
-          PROGS1 = xfindproxy.exe
+          PROGS1 = xfindproxy
 
         PROGRAMS = $(PROGS1)
 
--- ./programs/xinit/Makefile.ORIGINAL	2002-08-17 05:07:03.000000000
+0100
+++ ./programs/xinit/Makefile	2002-08-17 05:07:22.000000000 +0100
@@ -905,7 +905,7 @@
           SRCS1 = xinit.c
           OBJS1 = xinit.o
    SAMPLECONFIG = xinitrc
-       PROGRAMS = xinit.exe
+       PROGRAMS = xinit
 
 all:: startx $(SAMPLECONFIG)
 
--- ./programs/xsm/Makefile.ORIGINAL	2002-08-17 05:08:02.000000000
+0100
+++ ./programs/xsm/Makefile	2002-08-17 05:08:21.000000000 +0100
@@ -905,7 +905,7 @@
 
         INCLUDES = -I.
 
-          PROGS1 = xsm.exe
+          PROGS1 = xsm
 
         PROGRAMS = $(PROGS1)
 

-- 
swamp-dog@ntlworld.com



More information about the Cygwin-xfree mailing list