diff options
| author | Jeffrey Armstrong <jeffrey.armstrong@approximatrix.com> | 2020-05-21 16:36:46 -0400 |
|---|---|---|
| committer | Jeffrey Armstrong <jeffrey.armstrong@approximatrix.com> | 2020-05-21 16:36:46 -0400 |
| commit | d7c7b1a7c9d3ed783942f9307f6537019f373876 (patch) | |
| tree | 4608959ef7429cba184f901a29a2fa7b47d36a15 | |
| parent | 11a07d703b2ee9f7dbb9f3e311a1f034b4c71a20 (diff) | |
| parent | 4bcbcf36c3fec37467dc7f38617106d8b1d46d19 (diff) | |
| download | LR-87-d7c7b1a7c9d3ed783942f9307f6537019f373876.tar.gz LR-87-d7c7b1a7c9d3ed783942f9307f6537019f373876.zip | |
Merge branch 'master' of lilarm.approximatrix.com:gemini-fortran
| -rw-r--r-- | makefile.gnu | 20 | ||||
| -rw-r--r-- | snap/snapcraft.yaml | 2 |
2 files changed, 18 insertions, 4 deletions
diff --git a/makefile.gnu b/makefile.gnu index 4284588..2193e13 100644 --- a/makefile.gnu +++ b/makefile.gnu @@ -38,6 +38,16 @@ modules: .PHONY: all clean +build/binary.o: binary.f90 | modules build + @echo Compiling binary.f90 + @$(FC) -c -o build/binary.o $(FFLAGS) binary.f90 +modules/binary.mod : | modules build/binary.o + +build/dumb_binary.o: dumb_binary.f90 | modules build + @echo Compiling dumb_binary.f90 + @$(FC) -c -o build/dumb_binary.o $(FFLAGS) dumb_binary.f90 +modules/dumb_binary.mod : | modules build/dumb_binary.o + build/dumb_render.o: dumb_render.f90 modules/render.mod | modules build @echo Compiling dumb_render.f90 @$(FC) -c -o "build/dumb_render.o" $(FFLAGS) "dumb_render.f90" @@ -68,7 +78,7 @@ build/layout.o: layout.f90 modules/render.mod | modules build @$(FC) -c -o "build/layout.o" $(FFLAGS) "layout.f90" modules/layout.mod : | modules build/layout.o -build/main.o: main.F90 modules/request.mod modules/dumb_render.mod modules/gemini_protocol.mod modules/layout.mod modules/file_handling.mod modules/history.mod | modules build +build/main.o: main.F90 modules/request.mod modules/dumb_binary.mod modules/dumb_render.mod modules/gemini_protocol.mod modules/layout.mod modules/file_handling.mod modules/history.mod | modules build @echo Compiling main.F90 @$(FC) -c -o "build/main.o" $(FFLAGS) "main.F90" @@ -93,6 +103,10 @@ build/request.o: request.f90 modules/network.mod modules/jessl.mod | modules bui modules/request.mod : | modules build/request.o clean: + @echo Deleting build/binary.o and related files + @$(RM) "build/binary.o" "modules/binary.mod" "modules/binary.smod" + @echo Deleting build/dumb_binary.o and related files + @$(RM) "build/dumb_binary.o" "modules/dumb_binary.mod" "modules/dumb_binary.smod" @echo Deleting build/dumb_render.o and related files @$(RM) "build/dumb_render.o" "modules/dumb_render.mod" "modules/dumb_render.smod" @echo Deleting build/escape.o and related files @@ -126,9 +140,9 @@ clean: @echo Deleting lr87 @$(RM) "lr87" -lr87: build/dumb_render.o build/escape.o build/files.o build/history.o build/jessl.o build/layout.o build/main.o build/network.o build/protocol.o build/render.o build/request.o +lr87: build/binary.o build/dumb_binary.o build/dumb_render.o build/escape.o build/files.o build/history.o build/jessl.o build/layout.o build/main.o build/network.o build/protocol.o build/render.o build/request.o @echo Generating lr87 - @$(FC) -o "lr87" build/dumb_render.o build/escape.o build/files.o build/history.o build/jessl.o build/layout.o build/main.o build/network.o build/protocol.o build/render.o build/request.o $(LDIR) $(PRJ_LFLAGS) + @$(FC) -o "lr87" build/binary.o build/dumb_binary.o build/dumb_render.o build/escape.o build/files.o build/history.o build/jessl.o build/layout.o build/main.o build/network.o build/protocol.o build/render.o build/request.o $(LDIR) $(PRJ_LFLAGS) all: lr87 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 0f92e94..3f1a7a8 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: lr87 base: core18 -version: '0.5' +version: '0.6' summary: LR-87 is a overly simple dumb-terminal gemini client description: | LR-87 is a simple implementation of a client for launching into the world of the |