Skip to content

Commit

Permalink
Git laesst keine leeren Ordner zu. Lib Ordner gekillt.
Browse files Browse the repository at this point in the history
  • Loading branch information
iagbole committed Dec 11, 2015
1 parent 1de062f commit 96d9b36
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@ share/hdf5-1.8.14.tar.bz2
share/v3.2.1.tar.gz
src/deplist.mk
src/srcfiles_pp.mk
bin/h5diff
bin/hopr
bin/preproctool
src/libpreproc.a
*.mod
*.o
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ clean:
veryclean:
cd src && $(MAKE) veryclean
cd tools/yplusestimator && $(MAKE) veryclean
rm -f lib/$(PREPROC_LIB)
rm -f src/$(PREPROC_LIB)
rm -f *~ */*~ */*/*~

cleanshare:
Expand Down
3 changes: 2 additions & 1 deletion share/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ cgns: dir
if [ ! -d $(SHARECOMP)/CGNS-$(CGNS_VERSION) ] ; then \
cd $(SHARECOMP) && tar -xvzf ../v$(CGNS_VERSION).tar.gz 1>/dev/null && cd .. ; \
fi ; \
sed -i 's/^c/!/g' $(CGNS_DIR)/src/cgnslib_f.h ;\
echo $(CGNS_DIR)/src/cgnslib_f.h.in ; \
sed -i s/^c/!/g $(CGNS_DIR)/cgnslib_f.h.in ;\
cd $(CGNS_DIR) && FC='$(FC)' ./configure --enable-lfs $(CGNSF2C) && $(MAKE) ; \
echo "===============================================================";\
echo "= C G N S D O N E =";\
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ all: builddeps
@echo '~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~'
@echo ' HOPR COMPILED, NOW LINKING...'
@echo '----------------------------------------------------------------------------------------'
$(FC) $(FLFLAGS) hopr.o ../lib/$(PREPROC_LIB) -o ../bin/hopr \
$(FC) $(FLFLAGS) hopr.o $(PREPROC_LIB) -o ../bin/hopr \
$(LIBDIRS) \
$(EXTERNAL_LIBS)
cp ../bin/hopr ../bin/preproctool
Expand All @@ -33,7 +33,7 @@ builddeps:
@python ../tools/builddeps/builddeps --source=srcfiles_pp.mk deplist.mk

$(PREPROC_LIB): $(OBJ)
$(AR) $(AR_FLAGS) ../lib/$(PREPROC_LIB) $(OBJ)
$(AR) $(AR_FLAGS) $(PREPROC_LIB) $(OBJ)

%.o: %.c
$(CC) -c $< -o $@
Expand Down

0 comments on commit 96d9b36

Please sign in to comment.