git://git.jankratochvil.net
/
gnokii.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was generated by cvs2svn to compensate for changes in r164,
[gnokii.git]
/
gnokii
/
Makefile
diff --git
a/gnokii/Makefile
b/gnokii/Makefile
index
8373efe
..
4719cc8
100644
(file)
--- a/
gnokii/Makefile
+++ b/
gnokii/Makefile
@@
-9,8
+9,13
@@
TOPDIR=..
include $(TOPDIR)/Makefile.global
TOPDIR=..
include $(TOPDIR)/Makefile.global
+
+CFLAGS += $(PTHREAD_CFLAGS)
+LDFLAGS += $(PTHREAD_LIBS)
+
ifdef XPM_LIBS
LDFLAGS +=$(XPM_LIBS)
ifdef XPM_LIBS
LDFLAGS +=$(XPM_LIBS)
+ LDLIBS +=$(XPM_LIBS)
endif
OBJS = gnokii.o
endif
OBJS = gnokii.o
@@
-19,11
+24,12
@@
ifdef OWN_GETOPT
OBJS += $(TOPDIR)/getopt/libgetopt.a
endif
OBJS += $(TOPDIR)/getopt/libgetopt.a
endif
-LDFLAGS += -L$(TOPDIR)/common -lgnokii
-
all: gnokii
all: gnokii
-gnokii: $(OBJS) $(TOPDIR)/common/gsm-filetypes.o
+gnokii: $(OBJS) $(TOPDIR)/common/libgnokii.a $(TOPDIR)/common/gsm-filetypes.o
+
+$(TOPDIR)/common/COMMON.o:
+ $(MAKE) -C $(TOPDIR)/common libgnokii.a
$(TOPDIR)/common/gsm-filetypes.o:
$(MAKE) -C $(TOPDIR)/common gsm-filetypes.o
$(TOPDIR)/common/gsm-filetypes.o:
$(MAKE) -C $(TOPDIR)/common gsm-filetypes.o