diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2022-11-23 13:33:52 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2022-11-23 13:33:52 +0100 |
| commit | 410e57d2db426cb4ab3c8f4b9472ee33e17a5f99 (patch) | |
| tree | 19047da520ae66de5f552dd480f457ff063f8647 | |
| parent | ce777110feaaccd9d0fd16d10fa2695ecdffd33e (diff) | |
Don't build libdecor demos, add generated files to .gitignore
1) We don't need to build the libdecor demo programs for FLTK.
2) The Wayland build process generates some source and header files
in the main src/ directory. These files are now ignored by git.
| -rw-r--r-- | .gitignore | 15 | ||||
| -rw-r--r-- | libdecor/build/Makefile | 9 |
2 files changed, 18 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index 09fe156dc..c805d501a 100644 --- a/.gitignore +++ b/.gitignore @@ -83,7 +83,18 @@ etc/FLTKConfig.cmake /src/*.sav /src/*.dylib -# /test/ -# see test/.gitignore +# Wayland build artifacts (generated files) + +src/text-input-client-protocol.h +src/text-input-protocol.c +src/xdg-decoration-client-protocol.h +src/xdg-decoration-protocol.c +src/xdg-shell-client-protocol.h +src/xdg-shell-protocol.c + +# Wayland demo programs (no longer being built) + +# libdecor/build/demo +# libdecor/build/egl **/.DS_Store diff --git a/libdecor/build/Makefile b/libdecor/build/Makefile index 8d7b8b673..dfbd20de7 100644 --- a/libdecor/build/Makefile +++ b/libdecor/build/Makefile @@ -38,11 +38,12 @@ Linux_NOPIE = -no-pie FreeBSD_NOPIE = NOPIE = ${${UNAME}_NOPIE} -all : demo $(GLWLDEMO) +# Don't build libdecor demo programs automatically: demo $(GLWLDEMO) +all : $(OBJECTS) depend: : echo "libdecor/build: make depend..." - + fl_libdecor.o : fl_libdecor.c ../src/libdecor.c ../../src/xdg-shell-protocol.c ../../src/xdg-decoration-protocol.c ../../src/text-input-protocol.c $(CC) $(CFLAGS) $(CFLAGS_DECOR) -c fl_libdecor.c -DLIBDECOR_PLUGIN_API_VERSION=1 -DLIBDECOR_PLUGIN_DIR=\"\" @@ -79,12 +80,12 @@ cursor-settings.o : ../src/cursor-settings.c wayland-scanner client-header \ $(PROTOCOLS)/unstable/text-input/text-input-unstable-v3.xml \ ../../src/text-input-client-protocol.h - + demo : ../demo/demo.c $(OBJECTS) $(CC) -o demo ../demo/demo.c -D_GNU_SOURCE -I../.. -I../src -I. -I../../src $(EXTRA_DECOR) $(OBJECTS) $(LDLIBS) -lm -rdynamic $(NOPIE) -Wl,--defsym=fl_libdecor_using_weston=0 egl : ../demo/egl.c $(OBJECTS) - $(CC) -o egl ../demo/egl.c -D_GNU_SOURCE -I../.. -I../src -I. -I../../src $(EXTRA_DECOR) $(OBJECTS) $(GLDLIBS) -lm -rdynamic $(NOPIE) -Wl,--defsym=fl_libdecor_using_weston=0 + $(CC) -o egl ../demo/egl.c -D_GNU_SOURCE -I../.. -I../src -I. -I../../src $(EXTRA_DECOR) $(OBJECTS) $(GLDLIBS) -lm -rdynamic $(NOPIE) -Wl,--defsym=fl_libdecor_using_weston=0 install: |