Skip to content

Commit

Permalink
Merge pull request #35 from skitt/restore-cppflags
Browse files Browse the repository at this point in the history
Revert "Remove flags getting specified twice"
  • Loading branch information
Matthias-Wandel committed May 30, 2021
2 parents ad243e4 + b4a3f31 commit c0c78ab
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#--------------------------------
OBJ=obj
SRC=.
CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)

Expand All @@ -15,7 +16,7 @@ objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/jpgqguess.o $(OBJ)/paths.o \
$(OBJ)/exif.o $(OBJ)/iptc.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o

$(OBJ)/%.o:$(SRC)/%.c
${CC} $(CFLAGS) -c $< -o $@
${CC} $(CFLAGS) $(CPPFLAGS) -c $< -o $@

jhead: $(objs) jhead.h
${CC} $(LDFLAGS) -o jhead $(objs) -lm
Expand Down

0 comments on commit c0c78ab

Please sign in to comment.