janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

$(TOPDIR), make: Minor fixes

Browse source
This commit is contained in:
Jan Lindemann 2002-07-03 20:33:20 +00:00 • committed by Jan Lindemann
commit 024bd57875
6 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

15
make/rules.mk
View file

@ -27,14 +27,11 @@ $(LIBDIR):
moc_%.cpp: %.h
$(MOC) -o $@ $<
#ifeq ($(LIBTYPE),shared)
#lib%.so: %.o $(LIB_SO)
#else
#lib%.so: %.o
#endif
# $(CC) $< $(LDFLAGS) -o $@
ifeq ($(LIBTYPE),shared)
lib%.so: %.o $(LIB_SO)
else
lib%.so: %.o
endif
$(CC) $< $(LDFLAGS) -o $@
$(LIB_SO): $(LIB_A)
@ -47,7 +44,7 @@ $(TOPDIR)/include/%.h: %.h
mkdir -p $(dir $@); cp $(@F) $@
$(TOPDIR)/bin/%.sh: %.sh
mkdir -p $(dir $@); cp $(@F) $@
mkdir -p $(dir $@); install -m 755 $(@F) $@
%.o: %.cpp
$(CPP) $(CPPFLAGS) -c $<
@ -73,7 +70,7 @@ $(LIBS):
make -C $(LIBDIR) all
$(INSTALL_HDRDIR) $(INSTALL_BINDIR) $(INSTALL_LIBDIR) $(INSTALL_MKDIR):
mkdir -p $@
$(INSTALL) -d -g $(EXEGROUP) -o $(EXEOWNER) -m $(EXEMODE) $@
$(INSTALLED_LIB_SO) $(INSTALLED_LIB_A): libdir.done