Skip to content

minor improvements #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fluxer wants to merge 8 commits into
base: master
Choose a base branch
from
Open

minor improvements #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5fdddd2
define BINDIR and DOCDIR used by install target
fluxer Aug 18, 2015
054fbae
define _DEFAULT_SOURCE to prevent numerous compile warnings
fluxer Aug 18, 2015
0e128ad
add gitignore file from tinyxlib
fluxer Aug 18, 2015
2cdb956
add xinit to the default all target
fluxer Oct 21, 2015
412bc19
fix xinit build, ensure LINKDIR is respected
fluxer Oct 21, 2015
0ec6f21
do not prepend DISTDIR to paths from standard_definitions.mk
fluxer Oct 21, 2015
f6a43b6
set MANDIR from standard_definitions.mk
fluxer Oct 21, 2015
b8d44cf
force X symlink creation
fluxer Oct 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
*.o
*.a
*.so
*.swp
*.so*
*.pc
*.bak
*.org
*.orig
*.diff
*.log
*.rej
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ DEFS= -DNOERROR
CFLAGS= -I.. -I../.. -I../../.. -I./include -I./common -I./render -I./Xext -I./lbx -I./fb -I./mi -I./miext/shadow -I./hw/kdrive -I./miext/layer -I./os $(COMMONDEFS) $(DEFS)

OBJS=
all: core Xfbdev
all: core Xfbdev xinit

core:
cd render; make
Expand All @@ -30,11 +30,11 @@ Xvesa: core

Xfbdev: core
cd hw/kdrive/fbdev; make
$(CC) $(CFLAGs) $(DEFS) $(LDFLAGS) -o Xfbdev dix/libdix.a os/libos.a hw/kdrive/fbdev/libfbdev.a miext/layer/liblayer.a hw/kdrive/libkdrive.a hw/kdrive/linux/liblinux.a miext/shadow/libshadow.a fb/libfb.a mi/libmi.a Xext/libext.a Xext/extmod/libextmod.a XTrap/libxtrap.a randr/librandr.a render/librender.a record/librecord.a $(LINKDIR) -lXfont -lXinerama -lX11 -lXdmcp -lz -lm
$(CC) $(CFLAGs) $(DEFS) $(LDFLAGS) -o Xfbdev dix/libdix.a os/libos.a hw/kdrive/fbdev/libfbdev.a miext/layer/liblayer.a hw/kdrive/libkdrive.a hw/kdrive/linux/liblinux.a miext/shadow/libshadow.a fb/libfb.a mi/libmi.a Xext/libext.a Xext/extmod/libextmod.a XTrap/libxtrap.a randr/librandr.a render/librender.a record/librecord.a $(LINKDIR) -lXfont -lXinerama -lX11 -lXdmcp -lz -lm

xinit:
cd init; make
$(CC) $(CFLAGs) $(DEFS) $(LDFLAGS) -o xinit init/xinit.o -lX11
$(CC) $(CFLAGs) $(DEFS) $(LDFLAGS) -o xinit init/xinit.o $(LINKDIR) -lX11 -lpthread

clean:
cd render; make clean
Expand All @@ -61,7 +61,7 @@ clean:
install:
install -D -m 755 Xfbdev $(DESTDIR)/$(BINDIR)/Xfbdev
install -m 755 xinit $(DESTDIR)/$(BINDIR)/xinit
ln -s $(BINDIR)/Xfbdev $(DESTDIR)/$(BINDIR)/X
ln -fs $(BINDIR)/Xfbdev $(DESTDIR)/$(BINDIR)/X
install -D -m 644 init/xinit.1 $(DESTDIR)/$(MANDIR)/man1/xinit.1
install -D -m 644 README $(DESTDIR)/$(DOCDIR)/tinyxserver/README
install -m 644 changelog $(DESTDIR)/$(DOCDIR)/tinyxserver/changelog
Expand Down
16 changes: 9 additions & 7 deletions standard_definitions.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ CC=/usr/bin/gcc
#CC=/opt/musl/bin/musl-gcc

####compilerflags####
COMPFLAGS=-pipe -fPIC -Os -Wall -D_BSD_SOURCE -D_GNU_SOURCE -D__KERNEL_STRICT_NAMES \
-fno-strength-reduce -nodefaultlibs -fno-strict-aliasing \
-ffunction-sections -fdata-sections \
-I. -I/usr/xsrc/pkg/usr/include
COMPFLAGS=-pipe -fPIC -Os -Wall -D_BSD_SOURCE -D_GNU_SOURCE -D_DEFAULT_SOURCE \
-D__KERNEL_STRICT_NAMES -fno-strength-reduce -nodefaultlibs \
-fno-strict-aliasing -ffunction-sections -fdata-sections -I. \
-I/usr/xsrc/pkg/usr/include


####extensions####
Expand Down Expand Up @@ -109,6 +109,8 @@ LINKDIR=-L/usr/xsrc/pkg/usr/lib
#INCDIR=/opt/musl/include

PREDIR=/usr
LIBDIR=$(DESTDIR)$(PREDIR)/lib
INCDIR=$(DESTIR)$(PREDIR)/include

LIBDIR=$(PREDIR)/lib
INCDIR=$(PREDIR)/include
BINDIR=$(PREDIR)/bin
DOCDIR=$(PREDIR)/doc
MANDIR=$(PREDIR)/man