dslinux/lib/flnx CHANGES COPYING ChangeLog Makefile config.h
Stefan Sperling
stsp at stsp.in-berlin.de
Fri Sep 1 03:48:09 CEST 2006
On Fri, Aug 25, 2006 at 04:23:06PM +0200, Stefan Sperling wrote:
> On Fri, Aug 25, 2006 at 03:40:39PM +0200, Amadeus wrote:
> > > here comes the magic:
> > > * checkout head branch
> > > * have cvs merge all new code form flnx_branch
> > > into head *almost automatically*.
> >
> > How, if I break Makefiles and directory structures to fit it into the
> > uCLinux build system? This is the major point here - and maybe it's
> > doable with SVN which can trace moved files. But CVS?
You don't need to break directory structure at all to compile
flnx for dslinux. Attached is a small patch that you can
apply to flnx-0.18-tar.gz (from ftp://ftp.pixil.org/pub/pixil/flnx)
to make it compile with dslinux straight away.
If you approve, please use a command like
cd lib/flnx ; find . -type f | grep -v CVS | xargs cvs remove -f
to remove everything currently in the lib/flnx directory, and use the
attached patch to recreate lib/flnx from scratch. This time using proper
3rd party branch semantics as desribed at
http://www.dslinux.org/wiki/DSLinux_CVS#Adding_new_third_party_software
(I've put the link here for others to refer to, not for Amadeus since
he already knows what I'm talking about.)
Note that there seem to be a couple of pointless binary files
in flnx-0.18-tar.gz, for example FL/.Enumerations.H.swp or a.out.gdb.
We should not add those to CVS.
--
stefan
http://stsp.in-berlin.de PGP Key: 0xF59D25F0
-------------- next part --------------
Binary files flnx.orig/FL/.Enumerations.H.swp and flnx/FL/.Enumerations.H.swp differ
diff -urN flnx.orig/FL/Fl_Window.H flnx/FL/Fl_Window.H
--- flnx.orig/FL/Fl_Window.H Thu Aug 7 23:18:38 2003
+++ flnx/FL/Fl_Window.H Fri Sep 1 03:26:35 2006
@@ -30,6 +30,8 @@
#define FL_WINDOW 0xF0 // all subclasses have type() >= this
+class Fl_X;
+
class Fl_Window : public Fl_Group {
friend class Fl_X; Fl_X *i; // points at the system-specific stuff
diff -urN flnx.orig/Makefile flnx/Makefile
--- flnx.orig/Makefile Thu Aug 7 23:18:38 2003
+++ flnx/Makefile Fri Sep 1 03:27:49 2006
@@ -23,9 +23,12 @@
# Please report all bugs and problems to "fltk-bugs at easysw.com".
#
+HOST=$(shell gcc -v 2>&1 | grep host | sed -e 's:.*--host=\([a-zA-Z0-9-]*\).*:\1:')
+
SHELL=/bin/sh
-DIRS = src fluid test
+DIRS = src
+
all: makeinclude
@for dir in $(DIRS); do\
@@ -33,7 +36,7 @@
if test ! -f $$dir/makedepend; then\
touch $$dir/makedepend;\
fi;\
- (cd $$dir;$(MAKE));\
+ (cd $$dir;$(MAKE)) || exit 1;\
done
install: makeinclude
@@ -65,7 +68,12 @@
rm -f config.log config.h config.status makeinclude
makeinclude: configure configh.in makeinclude.in
- ./configure
+ ./configure \
+ --host=${HOST} \
+ --with-microwin=$(ROOTDIR)/user/microwin/src \
+ --libdir=$(ROOTDIR)/user/microwin/src/lib \
+ --includedir=$(ROOTDIR)/include/microwin \
+ --prefix=/nonexistent
#
# End of "$Id: Makefile,v 1.1.1.1 2003/08/07 21:18:38 jasonk Exp $".
Binary files flnx.orig/a.out.gdb and flnx/a.out.gdb differ
diff -urN flnx.orig/src/Fl_Animator.cxx flnx/src/Fl_Animator.cxx
--- flnx.orig/src/Fl_Animator.cxx Thu Aug 7 23:18:39 2003
+++ flnx/src/Fl_Animator.cxx Fri Sep 1 03:26:35 2006
@@ -28,7 +28,7 @@
Fl_Animator::Fl_Animator(char * const *image, int X, int Y,
int fcount, int fwidth, int fheight,
- int interval, const char *label = 0)
+ int interval, const char *label)
: Fl_Widget(X,Y,fwidth,fheight,label)
{
diff -urN flnx.orig/src/Fl_x.cxx flnx/src/Fl_x.cxx
--- flnx.orig/src/Fl_x.cxx Thu Aug 7 23:18:40 2003
+++ flnx/src/Fl_x.cxx Fri Sep 1 03:26:35 2006
@@ -392,7 +392,7 @@
char buffer[256];
/* run server and window manager */
//sprintf(buffer, "%s/nano-X -p &; %s/nanowm &", NANOXFOLDER, NANOXFOLDER);
- sprintf (buffer, "%s/nano-X -p &", NANOXFOLDER);
+ sprintf (buffer, "/usr/bin/nano-X -p &");
system (buffer);
if ((d = GrOpen ()) < 0) {
printf ("cannot open Nano-X graphics,Please run 'nano-X -p' first.\n");
diff -urN flnx.orig/src/filename_list.cxx flnx/src/filename_list.cxx
--- flnx.orig/src/filename_list.cxx Thu Aug 7 23:18:40 2003
+++ flnx/src/filename_list.cxx Fri Sep 1 03:26:35 2006
@@ -40,7 +40,7 @@
}
int filename_list(const char *d, dirent ***list) {
-#if defined(_AIX) || defined(CRAY) || defined(linux) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#if defined(_AIX) || defined(CRAY) || defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
// on some systems you may need to do this, due to a rather common
// error in the prototype for the sorting function, where a level
// of pointer indirection is missing:
More information about the dslinux-devel
mailing list