Browse Source

Some fixes for the build.

master
Georg Hopp 8 years ago
parent
commit
71f8ad9574
Signed by: ghopp GPG Key ID: 4C5D226768784538
  1. 1
      Makefile
  2. 1
      docker/Makefile
  3. 6
      react/Makefile
  4. 2
      react/package-lock.json

1
Makefile

@ -17,6 +17,7 @@ all: docker
$(GOEXE): $(APP_NAME).go $(GOEXE): $(APP_NAME).go
go install $(GOPROJECT) go install $(GOPROJECT)
strip $@
docker: react $(GOEXE) docker: react $(GOEXE)
$(MAKE) -C $@ $(MAKE) -C $@

1
docker/Makefile

@ -15,6 +15,7 @@ all: $(LIBS) $(EXE) react Dockerfile
$(LIBS): $(LIBS):
install -D /lib64/$(notdir $@) $@ install -D /lib64/$(notdir $@) $@
strip $@
$(EXE): $(EXE):
install -D $(GOEXE) $@ install -D $(GOEXE) $@

6
react/Makefile

@ -33,8 +33,12 @@ SOURCES = src/About.css \
all: .buildchk all: .buildchk
.buildchk: $(SOURCES) .buildchk: $(SOURCES)
npm install
npm run build npm run build
touch $@ touch $@
clean: clean:
rm -Rf build/*
rm -Rf build
rm -Rf coverage
rm -Rf node_modules
rm -Rf .buildchk

2
react/package-lock.json

@ -1,5 +1,5 @@
{ {
"name": "my-app",
"name": "steffers.org",
"version": "0.1.0", "version": "0.1.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,

Loading…
Cancel
Save